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

Commit 07c9ac0e authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "More base_rules.mk optimizations"

parents d1f4c15f 46a88893

core/base_rules.mk

+3 −1
Original line number Diff line number Diff line
@@ -878,6 +878,7 @@ INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name) 
##########################################################

# Track module-level dependencies.

# Use $(LOCAL_MODULE) instead of $(my_register_name) to ignore module's bitness.

ifneq (,$(filter deps-license,$(MAKECMDGOALS)))

ALL_DEPS.MODULES := $(ALL_DEPS.MODULES) $(LOCAL_MODULE)

ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \

  $(ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS) \
@@ -890,6 +891,7 @@ ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \ 
  $(LOCAL_JNI_SHARED_LIBRARIES))



ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $(license_files))

endif



###########################################################

## Take care of my_module_tags
@@ -899,7 +901,7 @@ ALL_DEPS.$(LOCAL_MODULE).LICENSE := $(sort $(ALL_DEPS.$(LOCAL_MODULE).LICENSE) $ 
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),\

$(foreach tag,$(filter-out optional,$(my_module_tags)),\

    $(eval ALL_MODULE_NAME_TAGS.$(tag) := $$(ALL_MODULE_NAME_TAGS.$(tag)) $(my_register_name)))



###########################################################