Merge changes Id1d8ffb8,I20a6396d am: f398cc78fe
am: 589471eb35
am: 7d00b5144d
Change-Id: I4db990ca8469fc6e71e74bb43a79b7188b26c78c
This commit is contained in:
commit
78bb63da91
2 changed files with 2 additions and 2 deletions
|
@ -622,7 +622,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),\
|
||||
$(eval ALL_MODULE_NAME_TAGS.$(tag) += $(my_register_name)))
|
||||
$(eval ALL_MODULE_NAME_TAGS.$(tag) := $$(ALL_MODULE_NAME_TAGS.$(tag)) $(my_register_name)))
|
||||
|
||||
###########################################################
|
||||
## umbrella targets used to verify builds
|
||||
|
|
|
@ -2971,7 +2971,7 @@ STATS.MODULE_TYPE := \
|
|||
base_rules \
|
||||
HEADER_LIBRARY
|
||||
|
||||
$(foreach $(s),$(STATS.MODULE_TYPE),$(eval STATS.MODULE_TYPE.$(s) :=))
|
||||
$(foreach s,$(STATS.MODULE_TYPE),$(eval STATS.MODULE_TYPE.$(s) :=))
|
||||
define record-module-type
|
||||
$(strip $(if $(LOCAL_RECORDED_MODULE_TYPE),,
|
||||
$(if $(filter-out $(SOONG_ANDROID_MK),$(LOCAL_MODULE_MAKEFILE)),
|
||||
|
|
Loading…
Reference in a new issue