Make java_sdk_library dependencies explicit
modules should specify the submodule of java_sdk_library that the module
actually depends on
Test: CI
Flag: EXEMPT build dependency cleanup
Bug: 358613520
Change-Id: I78dec317d4e74275287e3a5b7f5ffe2b10db05ab
diff --git a/tests/Enable16KbTests/Android.bp b/tests/Enable16KbTests/Android.bp
index fa05d33..7e1d32c 100644
--- a/tests/Enable16KbTests/Android.bp
+++ b/tests/Enable16KbTests/Android.bp
@@ -34,8 +34,8 @@
platform_apis: true,
certificate: "platform",
libs: [
- "android.test.runner",
- "android.test.base",
+ "android.test.runner.stubs.system",
+ "android.test.base.stubs.system",
],
}
diff --git a/tests/anomaly-tester/Android.bp b/tests/anomaly-tester/Android.bp
index d437a6c..63af4ee 100644
--- a/tests/anomaly-tester/Android.bp
+++ b/tests/anomaly-tester/Android.bp
@@ -13,7 +13,7 @@
certificate: "platform",
- libs: ["android.test.runner"],
+ libs: ["android.test.runner.stubs.system"],
static_libs: [
"androidx.test.rules",
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 7e3a8aa..b35bd4a 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -14,7 +14,7 @@
certificate: "platform",
libs: [
- "android.test.runner",
+ "android.test.runner.stubs.system",
],
static_libs: [
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index d6210e7..3fd4306 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -76,7 +76,7 @@
],
libs: [
- "android.test.mock",
+ "android.test.mock.impl",
"ims-common",
],
diff --git a/tests/screenshot/Android.bp b/tests/screenshot/Android.bp
index 5130fe5..f79d00f 100644
--- a/tests/screenshot/Android.bp
+++ b/tests/screenshot/Android.bp
@@ -66,9 +66,9 @@
],
libs: [
- "android.test.runner",
- "android.test.base",
- "android.test.mock",
+ "android.test.runner.impl",
+ "android.test.base.impl",
+ "android.test.mock.impl",
"truth",
],
diff --git a/tests/uitests/Android.bp b/tests/uitests/Android.bp
index d5852b3..be402f4 100644
--- a/tests/uitests/Android.bp
+++ b/tests/uitests/Android.bp
@@ -33,8 +33,8 @@
],
libs: [
- "android.test.runner",
- "android.test.base",
+ "android.test.runner.stubs.system",
+ "android.test.base.stubs.system",
],
static_libs: [