commit ae4daccc6ced2585061f8d7569b34c424f6fd6a0
author Paul Duffin <paulduffin@google.com> Wed Apr 21 23:59:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 21 23:59:39 2021 +0000
tree 2fe4f2490ff52b0941713fe10adcf9249c365483
parent ca237e9977b0745bbf2d55c4573a73b5d5182763
parent 52c3a345e7662ae531628a506288d4e01b0a2b83

Merge "Stop exporting implementation jar for core-icu4j" am: fc8922f4d9 am: dfaa877160 am: 52c3a345e7

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

Change-Id: I1656bb1b42965741045dda755b4f85766861c6b2

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",
             ],
         },