commit a2d0a60b79051b38ca00496d4d7f7361e5c4c754
author vichang <vichang@google.com> Tue May 05 11:46:51 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 05 11:46:51 2020 +0000
tree 1acb78ec47f91e424829592767931c10ae5eb14c
parent 879d654515e43f7575115ab6bdbf08db5a1b0fdb
parent b72f1e1a8ac59c60854a8de46713955c3549c5d3

Merge "Revert "Move core-icu4j into i18n APEX""

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 2a97acf..7dd19cf 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -261,6 +261,7 @@
 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 5c88ae8..3e5d3a3 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -320,7 +320,6 @@
     $(ART_APEX_JARS) \
     framework-minus-apex \
     ext \
-    com.android.i18n:core-icu4j \
     telephony-common \
     voip-common \
     ims-common \