diff options
| author | 2024-08-30 00:30:24 +0000 | |
|---|---|---|
| committer | 2024-08-30 00:30:24 +0000 | |
| commit | 310d9558a3f69f29a745717b8a0c11a45d8ac171 (patch) | |
| tree | 6ac70f24dcb7c365636b8e066b2626b904a8d943 | |
| parent | efbe1c098a77c3ddaae982e0eac01862e3e6c230 (diff) | |
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: Ie3ad72f004a5de8fd917de17864b8ea6cf1561fe
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | legacy/Android.bp | 2 | ||||
| -rw-r--r-- | photopicker/Android.bp | 2 | ||||
| -rw-r--r-- | tests/Android.bp | 6 | ||||
| -rw-r--r-- | tests/client/Android.bp | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp index a01784109..db381f61e 100644 --- a/Android.bp +++ b/Android.bp @@ -41,10 +41,10 @@ android_app { "unsupportedappusage", "app-compat-annotations", "framework-annotations-lib", - "framework-configinfrastructure", + "framework-configinfrastructure.stubs.module_lib", "framework-mediaprovider.impl", "framework-media.stubs.module_lib", - "framework-statsd", + "framework-statsd.stubs.module_lib", "keepanno-annotations", ], diff --git a/legacy/Android.bp b/legacy/Android.bp index 14d7f553d..498173ea2 100644 --- a/legacy/Android.bp +++ b/legacy/Android.bp @@ -15,7 +15,7 @@ android_app { libs: [ "app-compat-annotations", - "framework-mediaprovider", + "framework-mediaprovider.stubs.module_lib", ], srcs: [ diff --git a/photopicker/Android.bp b/photopicker/Android.bp index 192a9ed1b..633639fe0 100644 --- a/photopicker/Android.bp +++ b/photopicker/Android.bp @@ -11,7 +11,7 @@ android_library { sdk_version: "module_current", min_sdk_version: "30", libs: [ - "framework-configinfrastructure", + "framework-configinfrastructure.stubs.module_lib", "framework-connectivity.stubs.module_lib", ], static_libs: [ diff --git a/tests/Android.bp b/tests/Android.bp index 7fb7a7c26..13eee42b5 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -164,9 +164,9 @@ android_test { ], libs: [ - "android.test.base", - "android.test.mock", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.mock.stubs.system", + "android.test.runner.stubs.system", "unsupportedappusage", "framework-mediaprovider.impl", "keepanno-annotations", diff --git a/tests/client/Android.bp b/tests/client/Android.bp index e726941b2..bbf9dd808 100644 --- a/tests/client/Android.bp +++ b/tests/client/Android.bp @@ -20,9 +20,9 @@ android_test { ], libs: [ - "android.test.base", - "android.test.mock", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.mock.stubs.system", + "android.test.runner.stubs.system", ], static_libs: [ |