commit 5520858b97c13ea444a8f0931e74ef8aa69d53dd
author vichang <vichang@google.com> Thu May 07 09:34:51 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 07 09:34:51 2020 +0000
tree c13e8ab2abe64bf098d9a677d7e1b9c85ece83ae
parent dc8a239c6930f00cee6280d72a04d3ea722b84f8
parent ce051d16a470677112ee3e71d678fd9107c367bc

Merge ""Move core-icu4j into i18n APEX" Attempt 2"

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 \