StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move core-icu4j.jar down in PRODUCT_BOOT_JARS." am: d9d007b271 am: 4ce5d51b69 am: a1a3711528

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

Change-Id: I06f812f1be3080cc3eb57d9506efd293c54331b7
This commit is contained in:
Treehugger Robot
2021-04-29 09:55:45 +00:00
committed by Automerger Merge Worker
parent 6506d653a7 a1a3711528
commit 65120599da
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
target/product/default_art_config.mk
View File

@@ -18,17 +18,38 @@ ifeq ($(ART_APEX_JARS),)
$(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable) $(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
endif 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 := \ PRODUCT_BOOT_JARS := \
$(ART_APEX_JARS) \ $(ART_APEX_JARS)
# /system and /system_ext boot jars.
PRODUCT_BOOT_JARS += \
framework-minus-apex \ framework-minus-apex \
framework-graphics \ framework-graphics \
ext \ ext \
com.android.i18n:core-icu4j \
telephony-common \ telephony-common \
voip-common \ voip-common \
ims-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 := \ PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.appsearch:framework-appsearch \ com.android.appsearch:framework-appsearch \
com.android.conscrypt:conscrypt \ com.android.conscrypt:conscrypt \