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

Change-Id: I1d247bd4c515a87a5f944eec8d01cd96f41409a2
2020-05-05 12:16:16 +00:00 · 2020-05-05 12:16:16 +00:00 · e57e6fe7a8
parent 52c7a1f35f 0f1deb3a8b
commit e57e6fe7a8
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
@ -321,7 +321,6 @@ PRODUCT_BOOT_JARS := \
    $(ART_APEX_JARS) \
    framework-minus-apex \
    ext \
-    com.android.i18n:core-icu4j \
    telephony-common \
    voip-common \
    ims-common