p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Ying Wang 2014-11-18 12:41:53 -08:00
parent 56dedc22ba
commit 0e36bfeb3f
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/base_rules.mk
View File

@ -645,14 +645,6 @@ INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)
# Keep track of all the tags we've seen. # Keep track of all the tags we've seen.
ALL_MODULE_TAGS := $(sort $(ALL_MODULE_TAGS) $(my_module_tags)) 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. # Add this module name to the tag list of each specified tag.
$(foreach tag,$(my_module_tags),\ $(foreach tag,$(my_module_tags),\
$(eval ALL_MODULE_NAME_TAGS.$(tag) += $(my_register_name))) $(eval ALL_MODULE_NAME_TAGS.$(tag) += $(my_register_name)))

2
core/definitions.mk
View File

@ -684,7 +684,7 @@ endef
# any of those tags. # any of those tags.
# $(1): tag list # $(1): tag list
define modules-for-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 endef
# Same as modules-for-tag-list, but operates on # Same as modules-for-tag-list, but operates on