diff options
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rw-r--r-- | core/main.mk | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/core/Makefile b/core/Makefile index 726038fdce..6926b26a7e 100644 --- a/core/Makefile +++ b/core/Makefile @@ -493,7 +493,7 @@ $(all_event_log_tags_file): $(all_event_log_tags_src) $(pdk_fusion_log_tags_file # directory). event_log_tags_src := \ $(sort $(foreach m,\ - $(PRODUCT_PACKAGES) \ + $(call resolve-bitness-for-modules,TARGET,$(PRODUCT_PACKAGES)) \ $(call module-names-for-tag-list,user), \ $(ALL_MODULES.$(m).EVENT_LOG_TAGS)) \ $(filter-out vendor/% device/% out/%,$(all_event_log_tags_src))) diff --git a/core/main.mk b/core/main.mk index 21ec6f926e..9c52b01149 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1184,15 +1184,17 @@ ifdef FULL_BUILD # Some modules produce only host installed files when building with TARGET_BUILD_APPS ifeq ($(TARGET_BUILD_APPS),) - _modules := $(foreach m,$(PRODUCT_PACKAGES) \ - $(PRODUCT_PACKAGES_DEBUG) \ - $(PRODUCT_PACKAGES_DEBUG_ASAN) \ - $(PRODUCT_PACKAGES_ENG) \ - $(PRODUCT_PACKAGES_TESTS),\ + _modules := $(call resolve-bitness-for-modules,TARGET, \ + $(PRODUCT_PACKAGES) \ + $(PRODUCT_PACKAGES_DEBUG) \ + $(PRODUCT_PACKAGES_DEBUG_ASAN) \ + $(PRODUCT_PACKAGES_ENG) \ + $(PRODUCT_PACKAGES_TESTS)) + _host_modules := $(foreach m,$(_modules), \ $(if $(ALL_MODULES.$(m).INSTALLED),\ $(if $(filter-out $(HOST_OUT_ROOT)/%,$(ALL_MODULES.$(m).INSTALLED)),,\ $(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) endif |