commit a27b703c492c61920cab19f3b02807c7a04a86fd
author Victor Chang <vichang@google.com> Wed Apr 08 11:34:11 2020 +0100
committer Victor Chang <vichang@google.com> Mon May 04 12:46:03 2020 +0100
tree 5411f5bec1dc6ff94f7e0fda70c311a5e7f36798
parent 8023018b0cef986032951931bbc965f388178bf9

Move core-icu4j into i18n APEX

Bug: 138994281
Test: core-icu4j observed in i18n APEX
Change-Id: I10e6d49485305f84b31d62f858c3c032aba4d3df

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 \