commit e07d73c37487f77c1b806aae852d37409aa5b1de
author Jihoon Kang <jihoonkang@google.com> Fri Aug 30 00:29:12 2024 +0000
committer Jihoon Kang <jihoonkang@google.com> Wed Sep 11 00:02:58 2024 +0000
tree 1b88b5a810aecd2019de0d4315b3e3cfd353389f
parent 92232a807f20d6532f0c0e9e3717fd34b3edb69b

Make java_sdk_library dependencies explicit

modules should specify the submodule of java_sdk_library that the module
actually depends on

Test: CI
Ignore-AOSP-First: resolving merge conflicts
Flag: EXEMPT build dependency cleanup
Bug: 358613520
Change-Id: I80af0b9efa88c668306f0ff1d51491a8180dc57f

tests/testables/Android.bp

diff --git a/tests/testables/Android.bp b/tests/testables/Android.bp
index c0e3d63..7596ee7 100644
--- a/tests/testables/Android.bp
+++ b/tests/testables/Android.bp
@@ -27,8 +27,8 @@
     name: "testables",
     srcs: ["src/**/*.java"],
     libs: [
-        "android.test.runner",
-        "android.test.mock",
+        "android.test.runner.stubs.system",
+        "android.test.mock.stubs.system",
         "androidx.test.rules",
         "mockito-target-inline-minus-junit4",
     ],

tests/testables/tests/Android.bp

diff --git a/tests/testables/tests/Android.bp b/tests/testables/tests/Android.bp
index d6a4754..1eb36fa 100644
--- a/tests/testables/tests/Android.bp
+++ b/tests/testables/tests/Android.bp
@@ -45,9 +45,9 @@
         "libmultiplejvmtiagentsinterferenceagent",
     ],
     libs: [
-        "android.test.runner",
-        "android.test.base",
-        "android.test.mock",
+        "android.test.runner.stubs.system",
+        "android.test.base.stubs.system",
+        "android.test.mock.stubs.system",
     ],
     certificate: "platform",
     test_suites: [