From ce051d16a470677112ee3e71d678fd9107c367bc Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Tue, 5 May 2020 16:02:02 +0100 Subject: [PATCH] "Move core-icu4j into i18n APEX" Attempt 2 This reverts commit b72f1e1a8ac59c60854a8de46713955c3549c5d3. Reland https://r.android.com/1284676 Bug: 138994281 Test: core-icu4j observed in i18n APEX Change-Id: If773316261fb1f5fb37b56c5233efcc4a434354a --- core/envsetup.mk | 1 - target/product/base_system.mk | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index 7dd19cf408..2a97acfad5 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -261,7 +261,6 @@ endef ART_APEX_JARS := \ com.android.art:core-oj \ com.android.art:core-libart \ - com.android.art:core-icu4j \ com.android.art:okhttp \ com.android.art:bouncycastle \ com.android.art:apache-xml diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 3e5d3a3227..5c88ae8548 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -320,6 +320,7 @@ PRODUCT_BOOT_JARS := \ $(ART_APEX_JARS) \ framework-minus-apex \ ext \ + com.android.i18n:core-icu4j \ telephony-common \ voip-common \ ims-common \