tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "More base_rules.mk optimizations" am: 07c9ac0e2a am: bd49363d31

Browse source 
am: 7996f0610a

Change-Id: I1c99eb92c8a4f9ed8cce9b00e043c402b28dae29
This commit is contained in:
Dan Willemsen 2019-08-27 17:48:09 -07:00 committed by android-build-merger
commit 853699c6d6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/base_rules.mk
View file

@ -878,6 +878,7 @@ INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)
########################################################## ##########################################################
# Track module-level dependencies. # Track module-level dependencies.
# Use $(LOCAL_MODULE) instead of $(my_register_name) to ignore module's bitness. # Use $(LOCAL_MODULE) instead of $(my_register_name) to ignore module's bitness.
ifneq (,$(filter deps-license,$(MAKECMDGOALS)))
ALL_DEPS.MODULES := $(ALL_DEPS.MODULES) $(LOCAL_MODULE) ALL_DEPS.MODULES := $(ALL_DEPS.MODULES) $(LOCAL_MODULE)
ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \ ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \
$(ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS) \ $(ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS) \
@ -890,6 +891,7 @@ ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \
$(LOCAL_JNI_SHARED_LIBRARIES)) $(LOCAL_JNI_SHARED_LIBRARIES))
ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $(license_files)) ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $(license_files))
endif
########################################################### ###########################################################
## Take care of my_module_tags ## Take care of my_module_tags
@ -899,7 +901,7 @@ ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $
ALL_MODULE_TAGS := $(sort $(ALL_MODULE_TAGS) $(my_module_tags)) ALL_MODULE_TAGS := $(sort $(ALL_MODULE_TAGS) $(my_module_tags))
# Add this module name to the tag list of each specified tag. # Add this module name to the tag list of each specified tag.
$(foreach tag,$(my_module_tags),\ $(foreach tag,$(filter-out optional,$(my_module_tags)),\
$(eval ALL_MODULE_NAME_TAGS.$(tag) := $$(ALL_MODULE_NAME_TAGS.$(tag)) $(my_register_name))) $(eval ALL_MODULE_NAME_TAGS.$(tag) := $$(ALL_MODULE_NAME_TAGS.$(tag)) $(my_register_name)))
########################################################### ###########################################################