Merge "Revert "Move core-icu4j into i18n APEX"" am: a2d0a60b79

Change-Id: I0b6acbf4e78e4c9852edf0802cd10fc01b1dc1f2
2020-05-05 12:00:53 +00:00
parent 285ae1b0dd a2d0a60b79
commit 0f1deb3a8b
2 changed files with 1 additions and 1 deletions
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -261,6 +261,7 @@ 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
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -320,7 +320,6 @@ PRODUCT_BOOT_JARS := \
    $(ART_APEX_JARS) \
    framework-minus-apex \
    ext \
-    com.android.i18n:core-icu4j \
    telephony-common \
    voip-common \
    ims-common \