commit 1b19ab7cac224ff43e6583ba1cffdc95a22917e0
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 22 18:34:54 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Nov 22 18:34:54 2022 +0000
tree 528459cc2da79200fca50e81cb35a1fa72ee9c83
parent 358d8db659130d1b35899158da252fb0d9d6466c
parent 8ee78fd92f94fa7eb84e98a82475440aea8bca9c

Snap for 9320246 from 8ee78fd92f94fa7eb84e98a82475440aea8bca9c to mainline-art-release

Change-Id: Ie43079c1f6956b34b062eccf1f8b5ee1337f532c

android_icu4j/Android.bp

diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp
index dabd918..d912c19 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -151,6 +151,7 @@
     name: "core-icu4j-for-host",
     visibility: [
         "//art/build",
+        "//external/robolectric",
         "//external/robolectric-shadows",
         "//frameworks/layoutlib",
         "//packages/modules/RuntimeI18n/apex",

icu4j/Android.bp

diff --git a/icu4j/Android.bp b/icu4j/Android.bp
index 5ec0112..3faaa8a 100644
--- a/icu4j/Android.bp
+++ b/icu4j/Android.bp
@@ -47,6 +47,8 @@
         "//external/jimfs/jimfs",
         "//external/robolectric-shadows/robolectric",
         "//external/robolectric-shadows/shadows/framework",
+        "//external/robolectric/robolectric",
+        "//external/robolectric/shadows/framework",
         "//system/timezone/input_tools/android/telephonylookup_generator",
         "//system/timezone/input_tools/android/tzlookup_generator",
     ],
@@ -127,6 +129,7 @@
     name: "icu4j-icudata-jarjar",
     visibility: [
         "//external/robolectric-shadows",
+        "//external/robolectric",
         "//frameworks/layoutlib",
     ],
     defaults: ["icu4j-defaults"],
@@ -138,6 +141,7 @@
     name: "icu4j-icutzdata-jarjar",
     visibility: [
         "//external/robolectric-shadows",
+        "//external/robolectric",
         "//frameworks/layoutlib",
     ],
     defaults: ["icu4j-defaults"],