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

Commit 134c8083 authored by Jiakai Zhang's avatar Jiakai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Add core-icu4j and consrypt to the ART boot image for testing." into main am: c07b049a 

Original change: https://android-review.googlesource.com/c/platform/build/+/2655207



Change-Id: Iac209f5e76eddc8abad22ecde668b4b00c422119
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4609692b c07b049a

target/product/default_art_config.mk

+6 −1
Original line number Diff line number Diff line
@@ -40,8 +40,11 @@ PRODUCT_BOOT_JARS := \ 


# 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 += \
@@ -116,6 +119,8 @@ PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \ 
# <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.