Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 589471eb authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge changes Id1d8ffb8,I20a6396d 

am: f398cc78

Change-Id: I1d646eb40f1a15d6ea5b12af92b36f26526e4fe5
parents 81e4d14c f398cc78

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -2962,7 +2962,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)),