commit 986dcbca1f494106acadf0406a33fa7f1a379c07
author Paul Duffin <paulduffin@google.com> Sun May 16 05:38:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sun May 16 05:38:36 2021 +0000
tree 2fe4f2490ff52b0941713fe10adcf9249c365483
parent 7cf722442928b076f8036e37f1a66bdb45a4b225
parent 5971a194669e99193665f6168ce5800e346588c6

Merge "Move icu related hidden API flag file contents from frameworks/base" am: 8aa97efe28 am: 531568fbf0 am: 0e64cd1319 am: ca237e9977 am: 5971a19466

Original change: https://android-review.googlesource.com/c/platform/packages/modules/RuntimeI18n/+/1676665

Change-Id: I36112eca7d75221a8f1f9fe501a849889c8cbdd0

apex/Android.bp

diff --git a/apex/Android.bp b/apex/Android.bp
index a177a14..91d6b9b 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -83,6 +83,9 @@
     host_supported: true,
     target: {
         android: {
+            java_boot_libs: [
+                "core-icu4j",
+            ],
             java_sdk_libs: [
                 "i18n.module.intra.core.api",
                 "legacy.i18n.module.platform.api",
@@ -118,7 +121,6 @@
         android: {
             java_libs: [
                 // For use by robolectric and ART tests.
-                "core-icu4j",
                 "core-icu4j-for-host",
             ],
         },