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

Commit bcb47764 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move core-icu4j to PRODUCT_UPDATABLE_BOOT_JARS."

parents d15c7809 09e9471e

core/product_config.mk

+9 −0
Original line number Diff line number Diff line
@@ -249,6 +249,15 @@ PRODUCT_BOOT_JARS += $(PRODUCT_BOOT_JARS_EXTRA) 


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.

# $(1): Name of a boot jars variable with <apex>:<jar> pairs.

define replace-boot-jar-module-overrides

target/product/default_art_config.mk

+4 −6
Original line number Diff line number Diff line
@@ -44,13 +44,11 @@ PRODUCT_BOOT_JARS += \ 
    voip-common \

    ims-common



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

PRODUCT_BOOT_JARS += \

    com.android.i18n:core-icu4j



# Updatable APEX boot jars. Keep the list sorted by module names and then library names.

# APEX boot jars. Keep the list sorted by module names and then library names.

# Note: core-icu4j is moved back to PRODUCT_BOOT_JARS in product_config.mk at a later stage.

PRODUCT_UPDATABLE_BOOT_JARS := \

    com.android.conscrypt:conscrypt \

    com.android.i18n:core-icu4j \

    com.android.ipsec:android.net.ipsec.ike \

    com.android.media:updatable-media \

    com.android.mediaprovider:framework-mediaprovider \
@@ -60,7 +58,7 @@ PRODUCT_UPDATABLE_BOOT_JARS := \ 
    com.android.tethering:framework-tethering \

    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 := \

    com.android.art:service-art \

    com.android.permission:service-permission \