diff options
| author | 2024-09-06 18:29:58 +0000 | |
|---|---|---|
| committer | 2024-09-06 18:29:58 +0000 | |
| commit | be616a70313a8a5616d9792432936ee93bee8cc6 (patch) | |
| tree | cd55e8908237520107708229e13678ac012397cc | |
| parent | bb28ac087536d8dcc1d02ea5c0caa2555be1de4a (diff) | |
| parent | 295dde8e83f65f2dd3c4458b1cad493cd3723175 (diff) | |
Merge "Make java_sdk_library dependencies explicit" into main
| -rw-r--r-- | framework/Android.bp | 2 | ||||
| -rw-r--r-- | service/tests/wifitests/Android.bp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/Android.bp b/framework/Android.bp index 7d0ae97569..fe6fdce004 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -118,7 +118,7 @@ java_defaults { "aconfig-annotations-lib", // library for generated flag code read new storage "aconfig_storage_reader_java", - "framework-configinfrastructure", + "framework-configinfrastructure.stubs.module_lib", ], aidl: { generate_get_transaction_name: true, diff --git a/service/tests/wifitests/Android.bp b/service/tests/wifitests/Android.bp index 260393243b..bd82d8d7b9 100644 --- a/service/tests/wifitests/Android.bp +++ b/service/tests/wifitests/Android.bp @@ -59,9 +59,9 @@ android_test { // if sdk_version="" this gets automatically included, but here we need to add manually. "framework-res", - "android.test.runner", - "android.test.base", - "android.test.mock", + "android.test.runner.stubs", + "android.test.base.stubs", + "android.test.mock.stubs", // load the resources from the resources APK. "ServiceWifiResources", "auto_value_annotations", |