commit b70c42079a50c6470c238239f9f7033c78aa9a04
author Ying Wang <wangying@google.com> Fri Apr 03 14:52:55 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 03 14:52:55 2015 +0000
tree c8ba916b56c29448d22237147649879bfc8d2ca3
parent 3101e61f5e7e0025d997d218e975b9c715b37648
parent 5c11bd52db5d0887196895f321bf723ca1d206c7

am 5c11bd52: am 20fa9a8e: am 62003acd: Merge "Use PRIVATE_ALL_OBJECTS"

* commit '5c11bd52db5d0887196895f321bf723ca1d206c7':
  Use PRIVATE_ALL_OBJECTS

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index c13283d..09adc7d 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1340,7 +1340,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
 
 ###########################################################
@@ -1389,7 +1389,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