diff --git a/Android.bp b/Android.bp index 78db013d3a..8bd1bf5264 100644 --- a/Android.bp +++ b/Android.bp @@ -94,7 +94,7 @@ filegroup { android_library { name: "launcher-aosp-tapl", libs: [ - "framework-statsd", + "framework-statsd.stubs.module_lib", ], static_libs: [ "androidx.annotation_annotation", @@ -269,7 +269,7 @@ android_library { "quickstep/res", ], libs: [ - "framework-statsd", + "framework-statsd.stubs.module_lib", ], static_libs: [ "Launcher3ResLib", @@ -326,7 +326,7 @@ android_library { ], 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 1e2caa7aa8..8ce95072ff 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -153,9 +153,9 @@ android_test { "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 @@ android_robolectric_test { "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",