commit 9f8e4b6b6282360997038de0f73163fbc73e073a
author Jihoon Kang <jihoonkang@google.com> Fri Aug 30 00:29:41 2024 +0000
committer Jihoon Kang <jihoonkang@google.com> Fri Aug 30 00:29:41 2024 +0000
tree 00a6b513248fc7ce8d19e665de9a075c12791263
parent a627a31a366b77df0cc50944086e5580ba4a28f5

Make java_sdk_library dependencies explicit

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

Test: CI
Bug: 358613520
Change-Id: If1b96a7ffa7ddde50c44817e0d96257ae2967a0e

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 1e2caa7..8ce9507 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -153,9 +153,9 @@
         "com_android_launcher3_flags_lib",
     ],
     libs: [
-        "android.test.base",
-        "android.test.runner",
-        "android.test.mock",
+        "android.test.base.stubs.system",
+        "android.test.runner.stubs.system",
+        "android.test.mock.stubs.system",
     ],
     // Libraries used by mockito inline extended
     jni_libs: [
@@ -260,9 +260,9 @@
         "launcher-testing-shared",
     ],
     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",
         "truth",
     ],
     instrumentation_for: "Launcher3",