Add core-icu4j and consrypt to the ART boot image for testing.
Bug: 290583827
Test: art/tools/buildbot-build.sh --host
Test: m test-art-host-gtest
Test: m build-art-target-golem
Test: m build-art-host-golem
Change-Id: I8d0069b51484deb193350332ff911a89f2c4ee56
diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index aca64b8..3ca4187 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -40,8 +40,11 @@
# List of jars to be included in the ART boot image for testing.
# DO NOT reorder this list. The order must match the one described above.
+# Note: We use the host variant of "core-icu4j" and "conscrypt" for testing.
PRODUCT_TEST_ONLY_ART_BOOT_IMAGE_JARS := \
- $(ART_APEX_JARS)
+ $(ART_APEX_JARS) \
+ platform:core-icu4j-host \
+ platform:conscrypt-host \
# /system and /system_ext boot jars.
PRODUCT_BOOT_JARS += \
@@ -115,6 +118,8 @@
# <old_apex>:<old_jar>:<new_apex>:<new_jar>
PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES := \
platform:framework-minus-apex:platform:framework \
+ platform:core-icu4j-host:com.android.i18n:core-icu4j \
+ platform:conscrypt-host:com.android.conscrypt:conscrypt \
# Minimal configuration for running dex2oat (default argument values).
# PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.