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

Commit 4ce5d51b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move core-icu4j.jar down in PRODUCT_BOOT_JARS." am: d9d007b2 

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

Change-Id: I554e9d2f8213e0cb52fad7cecec23beb68f51043
parents ce4ec046 d9d007b2

target/product/default_art_config.mk

+24 −3
Original line number Diff line number Diff line
@@ -18,16 +18,37 @@ ifeq ($(ART_APEX_JARS),) 
  $(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)

endif



# The order matters for runtime class lookup performance.

# Order of the jars on BOOTCLASSPATH follows:

# 1. ART APEX jars

# 2. System jars

# 3. System_ext jars

# 4. Non-updatable APEX jars

# 5. Updatable APEX jars

#

# ART APEX jars (1) are defined in ART_APEX_JARS. System, system_ext, and non updatable boot jars

# are defined below in PRODUCT_BOOT_JARS. All updatable APEX boot jars are part of

# PRODUCT_UPDATABLE_BOOT_JARS.

#

# The actual runtime ordering matching above is determined by derive_classpath service at runtime.

# See packages/modules/SdkExtensions/README.md for more details.



# The order of PRODUCT_BOOT_JARS matters for runtime class lookup performance.

PRODUCT_BOOT_JARS := \

    $(ART_APEX_JARS) \

    $(ART_APEX_JARS)



# /system and /system_ext boot jars.

PRODUCT_BOOT_JARS += \

    framework-minus-apex \

    ext \

    com.android.i18n:core-icu4j \

    telephony-common \

    voip-common \

    ims-common



# Non-updatable APEX jars. Keep the list sorted.

PRODUCT_BOOT_JARS += \

    com.android.i18n:core-icu4j



# Updatable APEX jars. Keep the list sorted.

PRODUCT_UPDATABLE_BOOT_JARS := \

    com.android.conscrypt:conscrypt \

    com.android.media:updatable-media \