tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Resolve module bitness for PRODUCT_PACKAGES"

Browse source
This commit is contained in:
Yo Chiang 2020-05-20 04:55:22 +00:00 committed by Gerrit Code Review
commit 7c147f7e29
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/Makefile
View file

@ -493,7 +493,7 @@ $(all_event_log_tags_file): $(all_event_log_tags_src) $(pdk_fusion_log_tags_file
# directory). # directory).
event_log_tags_src := \ event_log_tags_src := \
$(sort $(foreach m,\ $(sort $(foreach m,\
$(PRODUCT_PACKAGES) \ $(call resolve-bitness-for-modules,TARGET,$(PRODUCT_PACKAGES)) \
$(call module-names-for-tag-list,user), \ $(call module-names-for-tag-list,user), \
$(ALL_MODULES.$(m).EVENT_LOG_TAGS)) \ $(ALL_MODULES.$(m).EVENT_LOG_TAGS)) \
$(filter-out vendor/% device/% out/%,$(all_event_log_tags_src))) $(filter-out vendor/% device/% out/%,$(all_event_log_tags_src)))

14
core/main.mk
View file

@ -1184,15 +1184,17 @@ ifdef FULL_BUILD
# Some modules produce only host installed files when building with TARGET_BUILD_APPS # Some modules produce only host installed files when building with TARGET_BUILD_APPS
ifeq ($(TARGET_BUILD_APPS),) ifeq ($(TARGET_BUILD_APPS),)
_modules := $(foreach m,$(PRODUCT_PACKAGES) \ _modules := $(call resolve-bitness-for-modules,TARGET, \
$(PRODUCT_PACKAGES_DEBUG) \ $(PRODUCT_PACKAGES) \
$(PRODUCT_PACKAGES_DEBUG_ASAN) \ $(PRODUCT_PACKAGES_DEBUG) \
$(PRODUCT_PACKAGES_ENG) \ $(PRODUCT_PACKAGES_DEBUG_ASAN) \
$(PRODUCT_PACKAGES_TESTS),\ $(PRODUCT_PACKAGES_ENG) \
$(PRODUCT_PACKAGES_TESTS))
_host_modules := $(foreach m,$(_modules), \
$(if $(ALL_MODULES.$(m).INSTALLED),\ $(if $(ALL_MODULES.$(m).INSTALLED),\
$(if $(filter-out $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,\ $(if $(filter-out $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,\
$(m)))) $(m))))
$(call maybe-print-list-and-error,$(sort $(_modules)),\ $(call maybe-print-list-and-error,$(sort $(_host_modules)),\
Host modules should be in PRODUCT_HOST_PACKAGES$(comma) not PRODUCT_PACKAGES) Host modules should be in PRODUCT_HOST_PACKAGES$(comma) not PRODUCT_PACKAGES)
endif endif