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

Merge "Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS."

Browse Source
This commit is contained in:
Treehugger Robot
2021-07-16 17:22:47 +00:00
committed by Gerrit Code Review
parent d15c78090c 09e9471eac
commit bcb4776446
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/product_config.mk
View File

@@ -249,6 +249,15 @@ PRODUCT_BOOT_JARS += $(PRODUCT_BOOT_JARS_EXTRA)
PRODUCT_BOOT_JARS := $(call qualify-platform-jars,$(PRODUCT_BOOT_JARS)) PRODUCT_BOOT_JARS := $(call qualify-platform-jars,$(PRODUCT_BOOT_JARS))
# b/191127295: force core-icu4j onto boot image. It comes from a non-updatable APEX jar, but has
# historically been part of the boot image; even though APEX jars are not meant to be part of the
# boot image.
# TODO(b/191686720): remove PRODUCT_UPDATABLE_BOOT_JARS to avoid a special handling of core-icu4j
# in make rules.
PRODUCT_UPDATABLE_BOOT_JARS := $(filter-out com.android.i18n:core-icu4j,$(PRODUCT_UPDATABLE_BOOT_JARS))
# All APEX jars come after /system and /system_ext jars, so adding core-icu4j at the end of the list
PRODUCT_BOOT_JARS += com.android.i18n:core-icu4j
# Replaces references to overridden boot jar modules in a boot jars variable. # Replaces references to overridden boot jar modules in a boot jars variable.
# $(1): Name of a boot jars variable with <apex>:<jar> pairs. # $(1): Name of a boot jars variable with <apex>:<jar> pairs.
define replace-boot-jar-module-overrides define replace-boot-jar-module-overrides

10
target/product/default_art_config.mk
View File

@@ -44,13 +44,11 @@ PRODUCT_BOOT_JARS += \
voip-common \ voip-common \
ims-common ims-common
# Non-updatable APEX jars. Keep the list sorted. # APEX boot jars. Keep the list sorted by module names and then library names.
PRODUCT_BOOT_JARS += \ # Note: core-icu4j is moved back to PRODUCT_BOOT_JARS in product_config.mk at a later stage.
com.android.i18n:core-icu4j
# Updatable APEX boot jars. Keep the list sorted by module names and then library names.
PRODUCT_UPDATABLE_BOOT_JARS := \ PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.conscrypt:conscrypt \ com.android.conscrypt:conscrypt \
com.android.i18n:core-icu4j \
com.android.ipsec:android.net.ipsec.ike \ com.android.ipsec:android.net.ipsec.ike \
com.android.media:updatable-media \ com.android.media:updatable-media \
com.android.mediaprovider:framework-mediaprovider \ com.android.mediaprovider:framework-mediaprovider \
@@ -60,7 +58,7 @@ PRODUCT_UPDATABLE_BOOT_JARS := \
com.android.tethering:framework-tethering \ com.android.tethering:framework-tethering \
com.android.wifi:framework-wifi com.android.wifi:framework-wifi
# Updatable APEX system server jars. Keep the list sorted by module names and then library names. # APEX system server jars. Keep the list sorted by module names and then library names.
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
com.android.art:service-art \ com.android.art:service-art \
com.android.permission:service-permission \ com.android.permission:service-permission \