Merge "Make java_sdk_library dependencies explicit" into main
diff --git a/tests/compliancetests/Android.bp b/tests/compliancetests/Android.bp
index 60a5a68..22dd985 100644
--- a/tests/compliancetests/Android.bp
+++ b/tests/compliancetests/Android.bp
@@ -20,10 +20,10 @@
java_defaults {
name: "CellBroadcastTestCommonComplianceTest",
libs: [
- "android.test.runner",
+ "android.test.runner.stubs.system",
"telephony-common",
- "android.test.base",
- "android.test.mock",
+ "android.test.base.stubs.system",
+ "android.test.mock.stubs.system",
],
static_libs: [
"androidx.test.rules",
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 423ccfa..10c8b1e 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -21,10 +21,10 @@
java_defaults {
name: "CellBroadcastTestCommon",
libs: [
- "android.test.runner",
+ "android.test.runner.stubs.system",
"telephony-common",
- "android.test.base",
- "android.test.mock",
+ "android.test.base.stubs.system",
+ "android.test.mock.stubs.system",
],
static_libs: [
"androidx.test.rules",