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

Commit b5e015fa authored by Yo Chiang's avatar Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Resolve module bitness for PRODUCT_PACKAGES" am: 7c147f7e 

Change-Id: I74a2a50ddf83df66f8f373d724d8417be8e44e45
parents 68e66200 7c147f7e

core/Makefile

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

core/main.mk

+8 −6
Original line number Diff line number Diff line
@@ -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) \

    _modules := $(call resolve-bitness-for-modules,TARGET, \

      $(PRODUCT_PACKAGES) \

      $(PRODUCT_PACKAGES_DEBUG) \

      $(PRODUCT_PACKAGES_DEBUG_ASAN) \

      $(PRODUCT_PACKAGES_ENG) \

                            $(PRODUCT_PACKAGES_TESTS),\

      $(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