diff options
| author | Ying Wang <wangying@google.com> | 2015-02-26 23:15:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-26 23:15:32 +0000 |
| commit | 41e3685f97d4b8034034c89676e88f7a7caa47c2 (patch) | |
| tree | 2371de675a09dc1fe9dad6b6b5833ffbd9fa7f4f /core | |
| parent | dae9bb50a5e733221a23c8d7458165cdf34028fc (diff) | |
| parent | bf565365debd77424dbcf0877089f6f33100d8db (diff) | |
| download | build-41e3685f97d4b8034034c89676e88f7a7caa47c2.zip build-41e3685f97d4b8034034c89676e88f7a7caa47c2.tar.gz build-41e3685f97d4b8034034c89676e88f7a7caa47c2.tar.bz2 | |
am bf565365: Use ALL_MODULES..INSTALLED in modules-for-tag-list
* commit 'bf565365debd77424dbcf0877089f6f33100d8db':
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
Diffstat (limited to 'core')
| -rw-r--r-- | core/base_rules.mk | 8 | ||||
| -rw-r--r-- | core/definitions.mk | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 8c25897..ec3b59f 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 38aa720..57fc434 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 |