commit 5e85bfe3a3fc53970aeba761d5e1c8f9e32e7dd4
author Yo Chiang <yochiang@google.com> Wed May 13 20:19:05 2020 +0800
committer Yo Chiang <yochiang@google.com> Thu May 14 04:07:56 2020 +0000
tree 739ec3666c9acbc598c0ef4e2a0a59ba248149fa
parent b85a140c3c0f7b2ff2123acd12fccac12ea3891a

Resolve module bitness for PRODUCT_PACKAGES

PRODUCT_PACKAGES contains "simple module name" and "bitness suffix".
Call `resolve-bitness-for-modules` to resolve module bitness before
using PRODUCT_PACKAGES.

Bug: 155869107
Test: TH presubmit build_test
Test: check the value of event_log_tags_src
Change-Id: I95fcd833990b3401892c2f7859c83acd90f9e920

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index f09c75b..c00d85d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1019,7 +1019,7 @@
 # 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)))