Merge "Make java_sdk_library dependencies explicit" into main
diff --git a/Android.bp b/Android.bp
index 78db013..8bd1bf5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -94,7 +94,7 @@
android_library {
name: "launcher-aosp-tapl",
libs: [
- "framework-statsd",
+ "framework-statsd.stubs.module_lib",
],
static_libs: [
"androidx.annotation_annotation",
@@ -269,7 +269,7 @@
"quickstep/res",
],
libs: [
- "framework-statsd",
+ "framework-statsd.stubs.module_lib",
],
static_libs: [
"Launcher3ResLib",
@@ -326,7 +326,7 @@
],
resource_dirs: [],
libs: [
- "framework-statsd",
+ "framework-statsd.stubs.module_lib",
],
// Note the ordering here is important when it comes to resource
// overriding. We want the most specific resource overrides defined
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",
