From 0e36bfeb3ffc78658cda3ca6931c66fe3f5b3d3b Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 18 Nov 2014 12:41:53 -0800 Subject: [PATCH] Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list Previously we store tag's installed modules in a separate variable ALL_MODULE_TAGS.$(tag). However we only record the main installed file for a module, but omit affiliated files like .odex. With this change, we handle the tagged module the same way as modules in PRODUCT_PACKAGES. Change-Id: I7972528a4df5a4ba8bc98930864da9672d32d7fe --- core/base_rules.mk | 8 -------- core/definitions.mk | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index 8c25897e5..ec3b59f4a 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -645,14 +645,6 @@ INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name) # Keep track of all the tags we've seen. ALL_MODULE_TAGS := $(sort $(ALL_MODULE_TAGS) $(my_module_tags)) -# Add this module to the tag list of each specified tag. -# Don't use "+=". If the variable hasn't been set with ":=", -# it will default to recursive expansion. -$(foreach tag,$(my_module_tags),\ - $(eval ALL_MODULE_TAGS.$(tag) := \ - $(ALL_MODULE_TAGS.$(tag)) \ - $(LOCAL_INSTALLED_MODULE))) - # Add this module name to the tag list of each specified tag. $(foreach tag,$(my_module_tags),\ $(eval ALL_MODULE_NAME_TAGS.$(tag) += $(my_register_name))) diff --git a/core/definitions.mk b/core/definitions.mk index 38aa72066..57fc434c2 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -684,7 +684,7 @@ endef # any of those tags. # $(1): tag list define modules-for-tag-list -$(sort $(foreach tag,$(1),$(ALL_MODULE_TAGS.$(tag)))) +$(sort $(foreach tag,$(1),$(foreach m,$(ALL_MODULE_NAME_TAGS.$(tag)),$(ALL_MODULES.$(m).INSTALLED)))) endef # Same as modules-for-tag-list, but operates on