Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b70c4207 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit '5c11bd52':
  Use PRIVATE_ALL_OBJECTS
parents 3101e61f 5c11bd52

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -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