From 8894e1f02ee81d0665ad34cc5e66a6a2eed16501 Mon Sep 17 00:00:00 2001 From: Alyssa Ketpreechasawat Date: Mon, 21 Aug 2023 12:32:59 +0000 Subject: [PATCH] Add mainline_module_prebuilt_* in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST. The newly added mainline_module_prebuilt_nightly and mainline_module_prebuilt_monthly_release are possible values for RELEASE_MAINLINE_MODULE_PREBUILT_VERSION (build flag in trunk stable). By adding these in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST, we would be able to choose mainline modules prebuilts (apks) based on release config. Bug: 294969202 Test: DEFAULT_MODULE_BUILD_FROM_SOURCE=false m (with 2 versions of apks, different blueprint_package_includes) Change-Id: Ifcc49e5499d4659b73179fff715945cd2e3ca4fa --- core/product_config.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/product_config.mk b/core/product_config.mk index 9f0cf25b72..192d0abf2d 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -282,7 +282,11 @@ current_product_makefile := ############################################################################# # Check product include tag allowlist -BLUEPRINT_INCLUDE_TAGS_ALLOWLIST := com.android.mainline_go com.android.mainline +BLUEPRINT_INCLUDE_TAGS_ALLOWLIST := \ + com.android.mainline_go \ + com.android.mainline \ + mainline_module_prebuilt_nightly \ + mainline_module_prebuilt_monthly_release .KATI_READONLY := BLUEPRINT_INCLUDE_TAGS_ALLOWLIST $(foreach include_tag,$(PRODUCT_INCLUDE_TAGS), \ $(if $(filter $(include_tag),$(BLUEPRINT_INCLUDE_TAGS_ALLOWLIST)),,\ @@ -293,7 +297,8 @@ ifeq (, $(PRODUCT_INCLUDE_TAGS)) # we still analyse it. # This means that in setups where we two have two prebuilts of module_sdk, we need a "default" to use in analysis # This should be a no-op in aosp and internal since no Android.bp file contains blueprint_package_includes -PRODUCT_INCLUDE_TAGS += com.android.mainline # Use the big android one by default +# Use the big android one and main-based prebuilts by default +PRODUCT_INCLUDE_TAGS += com.android.mainline mainline_module_prebuilt_nightly endif #############################################################################