summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRex Hoffman <rexhoffman@google.com>2022-11-13 22:41:16 +0000
committerRex Hoffman <rexhoffman@google.com>2022-11-13 22:41:16 +0000
commit5bbe8a427c490cae29c9313be2e2f62c289f264e (patch)
treee4f5594acd6640f08acdbcdcbafffe04c855fc5d
parent4dcd0b51eef678ac032051859c6ee6dbd5645eb8 (diff)
downloadicu-5bbe8a427c490cae29c9313be2e2f62c289f264e.tar.gz
Subject: [PATCH] Enable new_robolectric
Test: mma in /external/robolectric Bug: 244627502 Change-Id: I5c1275f73120ace4b5ce4e34a20c3c407217cc2f Merged-In: I5c1275f73120ace4b5ce4e34a20c3c407217cc2f
-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"],