commit c73e22026afc6a10714ef856d4e7e755fa310850
author Jihoon Kang <jihoonkang@google.com> Fri Aug 30 18:41:33 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 30 18:41:33 2024 +0000
tree 0ec85a518a0b05fdca39efcfcd06974128a2ef18
parent 1afbf33b7694856ee420f4e6b30eafb40b73d804
parent 04c737c1d4888e093ab167dff92d0103df6482e7

Make java_sdk_library dependencies explicit am: 04c737c1d4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Telephony/+/3248210

Change-Id: I9ee5b5586167826450de61c7120a507ce986f38b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/TelephonyStatsLib/Android.bp

diff --git a/libs/TelephonyStatsLib/Android.bp b/libs/TelephonyStatsLib/Android.bp
index 11a4cbd..10a1159 100644
--- a/libs/TelephonyStatsLib/Android.bp
+++ b/libs/TelephonyStatsLib/Android.bp
@@ -35,9 +35,9 @@
         "tests/**/*.java",
     ],
     libs: [
-        "android.test.runner",
-        "android.test.mock",
-        "android.test.base",
+        "android.test.runner.stubs.system",
+        "android.test.mock.stubs.system",
+        "android.test.base.stubs.system",
     ],
     static_libs: [
         "androidx.test.rules",

services/QualifiedNetworksService/Android.bp

diff --git a/services/QualifiedNetworksService/Android.bp b/services/QualifiedNetworksService/Android.bp
index addebd8..0e78894 100644
--- a/services/QualifiedNetworksService/Android.bp
+++ b/services/QualifiedNetworksService/Android.bp
@@ -45,8 +45,8 @@
         "telephony-common",
         "ims-common",
         "framework-annotations-lib",
-        "framework-connectivity",
-        "framework-wifi",
+        "framework-connectivity.stubs.module_lib",
+        "framework-wifi.stubs.module_lib",
     ],
 
     plugins: ["auto_value_plugin"],
@@ -83,11 +83,11 @@
         ":statslog-qns-java-gen",
     ],
     libs: [
-        "android.test.runner",
+        "android.test.runner.stubs.system",
         "telephony-common",
         "ims-common",
-        "android.test.mock",
-        "android.test.base",
+        "android.test.mock.stubs.system",
+        "android.test.base.stubs.system",
     ],
     static_libs: [
         "androidx.appcompat_appcompat",