commit 07c9ac0e2a4649b8b8d4da3c3a452d9e674bec77
author Dan Willemsen <dwillemsen@google.com> Tue Aug 27 23:42:24 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 27 23:42:24 2019 +0000
tree b131e57ef86489c5a2b54a37a1a19a8897adb83d
parent d1f4c15fd21fccbbce532780d267180171dbc8fb
parent 46a88893b179d7811833bbfd9cb4ea29d6c58648

Merge "More base_rules.mk optimizations"

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 511dda5..3a5e381 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -878,6 +878,7 @@
 ##########################################################
 # Track module-level dependencies.
 # 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.$(LOCAL_MODULE).ALL_DEPS := $(sort \
   $(ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS) \
@@ -890,6 +891,7 @@
   $(LOCAL_JNI_SHARED_LIBRARIES))
 
 ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $(license_files))
+endif
 
 ###########################################################
 ## Take care of my_module_tags
@@ -899,7 +901,7 @@
 ALL_MODULE_TAGS := $(sort $(ALL_MODULE_TAGS) $(my_module_tags))
 
 # 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)))
 
 ###########################################################