commit ce051d16a470677112ee3e71d678fd9107c367bc
author Victor Chang <vichang@google.com> Tue May 05 16:02:02 2020 +0100
committer Victor Chang <vichang@google.com> Tue May 05 19:16:30 2020 +0100
tree bf7a8f7103c0de27e1342c1b6cd518554cc3fb8d
parent a2d0a60b79051b38ca00496d4d7f7361e5c4c754

"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

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 7dd19cf..2a97acf 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -261,7 +261,6 @@
 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

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 3e5d3a3..5c88ae8 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -320,6 +320,7 @@
     $(ART_APEX_JARS) \
     framework-minus-apex \
     ext \
+    com.android.i18n:core-icu4j \
     telephony-common \
     voip-common \
     ims-common \