diff options
| author | 2024-08-30 18:09:23 +0000 | |
|---|---|---|
| committer | 2024-08-30 18:09:23 +0000 | |
| commit | 58ab85a874710bee1c6a79d8dbc0446a55907063 (patch) | |
| tree | 59b883a06424606a68718c231834875c19a191b6 | |
| parent | 9a267351b82447f8856bfe9f76eb4fcec894848f (diff) | |
| parent | f369ddf3a954a53ced4bc5da1635d0a623f9251a (diff) | |
Merge "Make java_sdk_library dependencies explicit" into main am: f369ddf3a9
Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/3247658
Change-Id: I7384958652e4d040889017e82d86d0604751a683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 122d480b2..5490ff696 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 a26651966..124bba225 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", "framework-mediaprovider.impl", ], diff --git a/tests/Android.bp b/tests/Android.bp index 25fbdf91f..49f11bb14 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -183,9 +183,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: [ |