Merge ""Move core-icu4j into i18n APEX" Attempt 2" am: 5520858b97

Change-Id: I1cbad50fa99e6a95573f6c4c011bdcb6622e8a5a
2020-05-07 09:51:23 +00:00 · 2020-05-07 09:51:23 +00:00 · 843604223e
parent 10c7950e0f 5520858b97
commit 843604223e
2 changed files with 1 additions and 1 deletions
--- 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
--- 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 \