diff options
| author | Ying Wang <wangying@google.com> | 2014-11-19 19:00:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 19:00:32 +0000 |
| commit | e55efcdde59f9f8cfc7fb0039b427cd038559c53 (patch) | |
| tree | 0ed469f05e8fa4d9f6968ceaceee2295849e1ed3 | |
| parent | a9653012fba44d1634c2cf85bfd3ef8559d6a6da (diff) | |
| parent | 471e60d6a89ada5a9ed322d200fbe14eb07764ff (diff) | |
| download | build-e55efcdde59f9f8cfc7fb0039b427cd038559c53.zip build-e55efcdde59f9f8cfc7fb0039b427cd038559c53.tar.gz build-e55efcdde59f9f8cfc7fb0039b427cd038559c53.tar.bz2 | |
am 471e60d6: Merge "Use ALL_MODULES..INSTALLED in modules-for-tag-list"
* commit '471e60d6a89ada5a9ed322d200fbe14eb07764ff':
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
| -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 acbecc4..38f04f1 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -650,14 +650,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 a5374c4..0bbdb6d 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 |