Use build flag to control the apex boot jars to be excluded.
Different prebuilts might have different contents and thus, different
boot jars to be removed from the existing apex boot jar lists e.g. next
using U prebuilts would need to remove framework-pdf while ap31 with V
prebuilts must not remove such. The existing mechanism will always
remove framework-pdf whenever prebuilts are enabled regardless of
release config, which is not correct in context of multiple prebuilt
support.
Ignore-AOSP-First: for successful build, we need to submit this togther with ag/26332775. this cl will get cp'ed into aosp later on
Bug: 327022391
Test: build device in next and trunk
Merged-In: I9949fb7075ab6c207a292f13fd75e010a4958f87
Change-Id: I9949fb7075ab6c207a292f13fd75e010a4958f87
diff --git a/core/art_config.mk b/core/art_config.mk
index 54bfd6b..47b4bcf 100644
--- a/core/art_config.mk
+++ b/core/art_config.mk
@@ -27,8 +27,11 @@
# soong variables indicate whether the prebuilt is enabled:
# - $(m)_module/source_build for art and TOGGLEABLE_PREBUILT_MODULES
# - ANDROID/module_build_from_source for other mainline modules
+# Note that RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST is the list of module names
+# and library names of jars that need to be removed. We have to keep separated list per
+# release config due to possibility of different prebuilt content.
APEX_BOOT_JARS_EXCLUDED :=
-$(foreach pair, $(PRODUCT_APEX_BOOT_JARS_FOR_SOURCE_BUILD_ONLY),\
+$(foreach pair, $(RELEASE_APEX_BOOT_JARS_PREBUILT_EXCLUDED_LIST),\
$(eval m := $(subst com.android.,,$(call word-colon,1,$(pair)))) \
$(if $(call soong_config_get,$(m)_module,source_build), \
$(if $(filter true,$(call soong_config_get,$(m)_module,source_build)),, \