summaryrefslogtreecommitdiffstats
path: root/core/definitions.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2015-04-02 18:02:33 -0700
committerYing Wang <wangying@google.com>2015-04-02 18:02:33 -0700
commit854607ec49fb4a3b5c9c5f9aeca1a282aa1d5d61 (patch)
tree18449c593d0e9120de920dbace51838604d06499 /core/definitions.mk
parent71d4c95f83018199b8e79d0800dd2eca80b9f728 (diff)
downloadbuild-854607ec49fb4a3b5c9c5f9aeca1a282aa1d5d61.zip
build-854607ec49fb4a3b5c9c5f9aeca1a282aa1d5d61.tar.gz
build-854607ec49fb4a3b5c9c5f9aeca1a282aa1d5d61.tar.bz2
Use PRIVATE_ALL_OBJECTS
Instead of the dirty $(filter) call. Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005
Diffstat (limited to 'core/definitions.mk')
-rw-r--r--core/definitions.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/definitions.mk b/core/definitions.mk
index d7aa477..25f667f 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1289,7 +1289,7 @@ $(extract-and-include-target-whole-static-libs)
@echo "target StaticLib: $(PRIVATE_MODULE) ($@)"
$(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \
- $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))
+ $(PRIVATE_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS))
endef
###########################################################
@@ -1338,7 +1338,7 @@ $(extract-and-include-host-whole-static-libs)
@echo "host StaticLib: $(PRIVATE_MODULE) ($@)"
$(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_ARFLAGS) \
- $(PRIVATE_ARFLAGS) $@,$(filter %.o, $^))
+ $(PRIVATE_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS))
endef