p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Do not call sort when setting ALL_DEPS.MODULES."

This commit is contained in:
Treehugger Robot 2018-08-29 18:28:41 +00:00 committed by Gerrit Code Review
parent 04552fed3b 1c31492ce0
commit acdaa8fbac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/base_rules.mk
View File

@ -776,7 +776,7 @@ INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(my_register_name)
########################################################## ##########################################################
# Track module-level dependencies. # Track module-level dependencies.
# Use $(LOCAL_MODULE) instead of $(my_register_name) to ignore module's bitness. # Use $(LOCAL_MODULE) instead of $(my_register_name) to ignore module's bitness.
ALL_DEPS.MODULES := $(sort $(ALL_DEPS.MODULES) $(LOCAL_MODULE)) ALL_DEPS.MODULES := $(ALL_DEPS.MODULES) $(LOCAL_MODULE)
ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \ ALL_DEPS.$(LOCAL_MODULE).ALL_DEPS := $(sort \
$(ALL_MODULES.$(LOCAL_MODULE).ALL_DEPS) \ $(ALL_MODULES.$(LOCAL_MODULE).ALL_DEPS) \
$(LOCAL_STATIC_LIBRARIES) \ $(LOCAL_STATIC_LIBRARIES) \

2
core/tasks/deps_licenses.mk
View File

@ -40,7 +40,7 @@ $(if $(_gmad_new),$(eval $(1) += $(_gmad_new))\
endef endef
define print-deps-license define print-deps-license
$(foreach m, $(ALL_DEPS.MODULES),\ $(foreach m, $(sort $(ALL_DEPS.MODULES)),\
$(eval m_p := $(sort $(ALL_MODULES.$(m).PATH) $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).PATH)))\ $(eval m_p := $(sort $(ALL_MODULES.$(m).PATH) $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).PATH)))\
$(if $(filter $(PROJ_PATH),$(m_p)),\ $(if $(filter $(PROJ_PATH),$(m_p)),\
$(eval deps :=)\ $(eval deps :=)\