From b72f1e1a8ac59c60854a8de46713955c3549c5d3 Mon Sep 17 00:00:00 2001
From: vichang <vichang@google.com>
Date: Tue, 5 May 2020 11:11:30 +0000
Subject: [PATCH] Revert "Move core-icu4j into i18n APEX"

Revert "Move libpac into i18n APEX"

Revert "Add shared library into i18n APEX and add the required s..."

Revert "Make com_android_i18n namespace visible"

Revert submission 1299494-i18nApex

Reason for revert: Breaking aosp_x86-eng on aosp-master
Reverted Changes:
I30fc3735b:Move ICU from ART APEX to i18n APEX
Icb7e98b5c:Calling @IntraCoreApi from core-icu4j should not c...
Ic7de63fe3:Move core-icu4j into I18n APEX
I65b97bdba:Make com_android_i18n namespace visible
Ia4c83bc15:Move v8 and libpac into i18n APEX
I10e6d4948:Move core-icu4j into i18n APEX
I8d989cad7:Move ICU from ART APEX into i18n APEX
I72216ca12:Move ICU into i18n APEX
Ief9dace85:Add shared library into i18n APEX and add the requ...
I7d97a10ba:Move libpac into i18n APEX
I90fff9c55:Move ICU from ART APEX into i18n APEX

Change-Id: I12a7d609d43620edaf2c5f12711eb3ca3a570d79
---
 core/envsetup.mk              | 1 +
 target/product/base_system.mk | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

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