commit 854607ec49fb4a3b5c9c5f9aeca1a282aa1d5d61
author Ying Wang <wangying@google.com> Thu Apr 02 18:02:33 2015 -0700
committer Ying Wang <wangying@google.com> Thu Apr 02 18:02:33 2015 -0700
tree 18449c593d0e9120de920dbace51838604d06499
parent 71d4c95f83018199b8e79d0800dd2eca80b9f728

Use PRIVATE_ALL_OBJECTS

Instead of the dirty $(filter) call.

Change-Id: Idd3c9be570a00dc365a08e5b4ba1cb2e1f0ce005

core/definitions.mk

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 @@
 @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 @@
 @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