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

* commit '5c11bd52db5d0887196895f321bf723ca1d206c7':
  Use PRIVATE_ALL_OBJECTS
This commit is contained in:
Ying Wang 2015-04-03 14:52:55 +00:00 committed by Android Git Automerger
commit b70c42079a

View file

@ -1340,7 +1340,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
###########################################################
@ -1389,7 +1389,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