summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRex Hoffman <rexhoffman@google.com>2022-11-17 22:42:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-11-17 22:42:22 +0000
commit8ee78fd92f94fa7eb84e98a82475440aea8bca9c (patch)
tree528459cc2da79200fca50e81cb35a1fa72ee9c83
parente8c5e91f96573869f10b72c0f418f2a16f9c7023 (diff)
parent5bbe8a427c490cae29c9313be2e2f62c289f264e (diff)
downloadicu-8ee78fd92f94fa7eb84e98a82475440aea8bca9c.tar.gz
Subject: [PATCH] Enable new_robolectric am: 5bbe8a427c
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icu/+/20460839 Change-Id: I90b5b7f3b4dcf826e5c425f1354a7a166602623f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--android_icu4j/Android.bp1
-rw-r--r--icu4j/Android.bp4
2 files changed, 5 insertions, 0 deletions
diff --git a/android_icu4j/Android.bp b/android_icu4j/Android.bp
index dabd9187e..d912c195c 100644
--- a/android_icu4j/Android.bp
+++ b/android_icu4j/Android.bp
@@ -151,6 +151,7 @@ java_library {
name: "core-icu4j-for-host",
visibility: [
"//art/build",
+ "//external/robolectric",
"//external/robolectric-shadows",
"//frameworks/layoutlib",
"//packages/modules/RuntimeI18n/apex",
diff --git a/icu4j/Android.bp b/icu4j/Android.bp
index 5ec011230..3faaa8a8e 100644
--- a/icu4j/Android.bp
+++ b/icu4j/Android.bp
@@ -47,6 +47,8 @@ java_library {
"//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 @@ java_library {
name: "icu4j-icudata-jarjar",
visibility: [
"//external/robolectric-shadows",
+ "//external/robolectric",
"//frameworks/layoutlib",
],
defaults: ["icu4j-defaults"],
@@ -138,6 +141,7 @@ java_library {
name: "icu4j-icutzdata-jarjar",
visibility: [
"//external/robolectric-shadows",
+ "//external/robolectric",
"//frameworks/layoutlib",
],
defaults: ["icu4j-defaults"],