Remove FrameworksCoreTests dep on framework-all
Make it use framework-statsd directly rather than framework-all.
Note that this is a problem on its own: the problematic tests
should be separated from the monolith tests and moved into the statsd
dir.
Also clamp down on framework-all visibility to avoid anyone else
addinga dependency on this problematic library.
Bug: 149928788
Bug: 149906971
Test: m
Exempt-From-Owner-Approval: clean cp
Change-Id: Ic819b90911220032130c3f8a01b612edd7fa3ecc
Merged-In: Ic819b90911220032130c3f8a01b612edd7fa3ecc
(cherry picked from commit 7c2f73b4ac0a17c31fe523df9c82e11811b9ee7e)
diff --git a/Android.bp b/Android.bp
index 82e1a86..7f6a7c1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -543,6 +543,13 @@
],
libs: ["icing-java-proto-lite"],
apex_available: ["//apex_available:platform"],
+ visibility: [
+ // DO NOT ADD ANY MORE ENTRIES TO THIS LIST
+ "//external/robolectric-shadows:__subpackages__",
+ "//frameworks/base/packages/Tethering/common/TetheringLib:__subpackages__",
+ "//frameworks/layoutlib:__subpackages__",
+ "//frameworks/opt/net/ike:__subpackages__",
+ ],
}
java_library {
diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 5533ed8..0f52f15 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -72,6 +72,8 @@
hostdex: true, // for hiddenapi check
visibility: [
"//frameworks/base/apex/statsd:__subpackages__",
+ // TODO(b/149928788): Remove when tests are moved.
+ "//frameworks/base/core/tests/coretests:__pkg__",
],
apex_available: [
"com.android.os.statsd",
diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp
index 33fead6..eb760b9 100644
--- a/core/tests/coretests/Android.bp
+++ b/core/tests/coretests/Android.bp
@@ -53,7 +53,9 @@
"android.test.base",
"android.test.mock",
"framework-atb-backward-compatibility",
- "framework-all",
+ // TODO(b/149928788): Remove this when statsd tests move into the statsd dir.
+ "framework-statsd",
+ "framework",
"icing-java-proto-lite",
"ext",
"framework-res",