commit 9f588bcd15833ec3ccdf0add7f05c9d652faa5c9
author Colin Cross <ccross@android.com> Tue Oct 10 21:52:17 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 10 21:52:17 2017 +0000
tree 02cd2b3741569a145ae267af6a557642ad51ed96
parent f398cc78fef290609a7c862d9b9d14d0a7f21785
parent abfa40776f126c1c2ef5b070ef59a5a9a30807a9

Merge "Add hostdex support for soong"

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index e7da560..a178b55 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -622,7 +622,7 @@
 
 # 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

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 27783ca..cb0a6bb 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2962,7 +2962,7 @@
   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)),