diff options
| author | 2024-08-30 00:29:12 +0000 | |
|---|---|---|
| committer | 2024-09-11 00:02:58 +0000 | |
| commit | e07d73c37487f77c1b806aae852d37409aa5b1de (patch) | |
| tree | 1b88b5a810aecd2019de0d4315b3e3cfd353389f | |
| parent | 92232a807f20d6532f0c0e9e3717fd34b3edb69b (diff) | |
Make java_sdk_library dependencies explicit
modules should specify the submodule of java_sdk_library that the module
actually depends on
Test: CI
Ignore-AOSP-First: resolving merge conflicts
Flag: EXEMPT build dependency cleanup
Bug: 358613520
Change-Id: I80af0b9efa88c668306f0ff1d51491a8180dc57f
125 files changed, 312 insertions, 298 deletions
diff --git a/apct-tests/perftests/core/Android.bp b/apct-tests/perftests/core/Android.bp index 65bc8ccd12f8..1e299cdf8002 100644 --- a/apct-tests/perftests/core/Android.bp +++ b/apct-tests/perftests/core/Android.bp @@ -52,7 +52,7 @@ android_test { "guava", ], - libs: ["android.test.base"], + libs: ["android.test.base.stubs.system"], java_resources: [":GoogleFontDancingScript"], diff --git a/apct-tests/perftests/healthconnect/Android.bp b/apct-tests/perftests/healthconnect/Android.bp index c38a24ee05d2..072010e90fae 100644 --- a/apct-tests/perftests/healthconnect/Android.bp +++ b/apct-tests/perftests/healthconnect/Android.bp @@ -37,7 +37,7 @@ android_test { "collector-device-lib-platform", ], - libs: ["android.test.base"], + libs: ["android.test.base.stubs.system"], platform_apis: true, test_suites: ["device-tests"], data: [":perfetto_artifacts"], diff --git a/apct-tests/perftests/packagemanager/Android.bp b/apct-tests/perftests/packagemanager/Android.bp index 02fc12cde04b..b2626911ea1e 100644 --- a/apct-tests/perftests/packagemanager/Android.bp +++ b/apct-tests/perftests/packagemanager/Android.bp @@ -28,7 +28,7 @@ android_test { "services.core", ], - libs: ["android.test.base"], + libs: ["android.test.base.stubs.system"], platform_apis: true, diff --git a/apct-tests/perftests/permission/Android.bp b/apct-tests/perftests/permission/Android.bp index bc8e7696440a..f4c7fbbf6593 100644 --- a/apct-tests/perftests/permission/Android.bp +++ b/apct-tests/perftests/permission/Android.bp @@ -43,7 +43,7 @@ android_test { "cts-install-lib-java", ], - libs: ["android.test.base"], + libs: ["android.test.base.stubs.system"], platform_apis: true, diff --git a/apct-tests/perftests/settingsprovider/Android.bp b/apct-tests/perftests/settingsprovider/Android.bp index e4aa14cd8a77..382803900507 100644 --- a/apct-tests/perftests/settingsprovider/Android.bp +++ b/apct-tests/perftests/settingsprovider/Android.bp @@ -28,7 +28,7 @@ android_test { "services.core", ], - libs: ["android.test.base"], + libs: ["android.test.base.stubs.system"], platform_apis: true, diff --git a/cmds/uiautomator/library/Android.bp b/cmds/uiautomator/library/Android.bp index cd1fb9a0f047..966bf13adfe4 100644 --- a/cmds/uiautomator/library/Android.bp +++ b/cmds/uiautomator/library/Android.bp @@ -71,7 +71,7 @@ java_library_static { ":uiautomator-stubs", ], libs: [ - "android.test.runner", + "android.test.runner.stubs.system", "junit", ], java_version: "1.8", @@ -84,8 +84,8 @@ java_library_static { "testrunner-src/**/*.java", ], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "junit", diff --git a/core/tests/BroadcastRadioTests/Android.bp b/core/tests/BroadcastRadioTests/Android.bp index beffb9aac12b..7d4ae00c405a 100644 --- a/core/tests/BroadcastRadioTests/Android.bp +++ b/core/tests/BroadcastRadioTests/Android.bp @@ -45,7 +45,7 @@ android_test { "flag-junit", "mockito-target-extended", ], - libs: ["android.test.base"], + libs: ["android.test.base.stubs.system"], test_suites: [ "general-tests", "automotive-general-tests", diff --git a/core/tests/ConnectivityManagerTest/Android.bp b/core/tests/ConnectivityManagerTest/Android.bp index f17a28d22c17..6421899631ff 100644 --- a/core/tests/ConnectivityManagerTest/Android.bp +++ b/core/tests/ConnectivityManagerTest/Android.bp @@ -24,8 +24,8 @@ package { android_test { name: "ConnectivityManagerTest", libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "junit", diff --git a/core/tests/GameManagerTests/Android.bp b/core/tests/GameManagerTests/Android.bp index 0e3bc6562edb..9d8468549b13 100644 --- a/core/tests/GameManagerTests/Android.bp +++ b/core/tests/GameManagerTests/Android.bp @@ -32,7 +32,7 @@ android_test { "platform-test-annotations", "truth", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], platform_apis: true, certificate: "platform", test_suites: ["device-tests"], diff --git a/core/tests/InputMethodCoreTests/Android.bp b/core/tests/InputMethodCoreTests/Android.bp index ac6462589e16..2b524d58ced7 100644 --- a/core/tests/InputMethodCoreTests/Android.bp +++ b/core/tests/InputMethodCoreTests/Android.bp @@ -42,9 +42,9 @@ android_test { ], libs: [ - "android.test.runner", - "android.test.base", - "android.test.mock", + "android.test.runner.stubs", + "android.test.base.stubs", + "android.test.mock.stubs", "framework", "ext", "framework-res", diff --git a/core/tests/PackageInstallerSessions/Android.bp b/core/tests/PackageInstallerSessions/Android.bp index b631df1fcf57..d10ecd07a44c 100644 --- a/core/tests/PackageInstallerSessions/Android.bp +++ b/core/tests/PackageInstallerSessions/Android.bp @@ -39,8 +39,8 @@ android_test { ], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs", + "android.test.base.stubs", "framework", "framework-res", ], diff --git a/core/tests/PlatformCompatFramework/Android.bp b/core/tests/PlatformCompatFramework/Android.bp index 2621d280bd9d..a3fdf7b43bee 100644 --- a/core/tests/PlatformCompatFramework/Android.bp +++ b/core/tests/PlatformCompatFramework/Android.bp @@ -12,8 +12,8 @@ android_test { // Include all test java files. srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "junit", diff --git a/core/tests/bandwidthtests/Android.bp b/core/tests/bandwidthtests/Android.bp index 8645b39da5a8..b7357122dff8 100644 --- a/core/tests/bandwidthtests/Android.bp +++ b/core/tests/bandwidthtests/Android.bp @@ -27,9 +27,9 @@ android_test { // Include all test java files. srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "org.apache.http.legacy", - "android.test.base", + "android.test.runner.stubs", + "org.apache.http.legacy.stubs", + "android.test.base.stubs", ], static_libs: [ "junit", diff --git a/core/tests/batterystatstests/BatteryStatsLoadTests/Android.bp b/core/tests/batterystatstests/BatteryStatsLoadTests/Android.bp index 1c0ea839ec02..926edfed16ef 100644 --- a/core/tests/batterystatstests/BatteryStatsLoadTests/Android.bp +++ b/core/tests/batterystatstests/BatteryStatsLoadTests/Android.bp @@ -16,7 +16,7 @@ android_test { "compatibility-device-util-axt", "junit", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], platform_apis: true, certificate: "platform", } diff --git a/core/tests/bugreports/Android.bp b/core/tests/bugreports/Android.bp index 15e07e535b39..c1022a54207d 100644 --- a/core/tests/bugreports/Android.bp +++ b/core/tests/bugreports/Android.bp @@ -26,8 +26,8 @@ android_test { srcs: ["src/**/*.java"], data: [":bugreport_artifacts"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.test", + "android.test.base.stubs.test", ], static_libs: [ "android.tracing.flags-aconfig-java", diff --git a/core/tests/companiontests/Android.bp b/core/tests/companiontests/Android.bp index d31b8f470108..cb0951e59d04 100644 --- a/core/tests/companiontests/Android.bp +++ b/core/tests/companiontests/Android.bp @@ -12,8 +12,8 @@ android_test { // Include all test java files. srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: ["junit"], platform_apis: true, diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index b0e48f1ccd93..7954c5a746b2 100644 --- a/core/tests/coretests/Android.bp +++ b/core/tests/coretests/Android.bp @@ -106,10 +106,10 @@ android_test { ], libs: [ - "android.test.runner", - "org.apache.http.legacy", - "android.test.base", - "android.test.mock", + "android.test.runner.stubs", + "org.apache.http.legacy.stubs", + "android.test.base.stubs", + "android.test.mock.stubs", "framework", "ext", "framework-res", @@ -156,8 +156,8 @@ android_app { use_resource_processor: false, libs: [ "framework-res", - "android.test.runner", - "org.apache.http.legacy", + "android.test.runner.stubs", + "org.apache.http.legacy.stubs", ], uses_libs: [ "android.test.runner", @@ -223,9 +223,9 @@ android_library { ], 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", "framework", "framework-res", ], @@ -234,8 +234,8 @@ android_library { android_ravenwood_test { name: "FrameworksCoreTestsRavenwood", libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "core-test-rules", // for libcore.dalvik.system.CloseGuardSupport diff --git a/core/tests/devicestatetests/Android.bp b/core/tests/devicestatetests/Android.bp index 60848b31eaec..a3303c6ca6d7 100644 --- a/core/tests/devicestatetests/Android.bp +++ b/core/tests/devicestatetests/Android.bp @@ -32,7 +32,7 @@ android_test { "platform-test-annotations", "testng", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], platform_apis: true, certificate: "platform", } diff --git a/core/tests/featureflagtests/Android.bp b/core/tests/featureflagtests/Android.bp index d9f608ea34c4..c08066720477 100644 --- a/core/tests/featureflagtests/Android.bp +++ b/core/tests/featureflagtests/Android.bp @@ -19,8 +19,8 @@ android_test { "androidx.test.rules", ], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], platform_apis: true, certificate: "platform", diff --git a/core/tests/hdmitests/Android.bp b/core/tests/hdmitests/Android.bp index 5f6eaf96a846..88f24d70c722 100644 --- a/core/tests/hdmitests/Android.bp +++ b/core/tests/hdmitests/Android.bp @@ -32,7 +32,7 @@ android_test { "platform-test-annotations", "truth", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], platform_apis: true, certificate: "platform", test_suites: ["device-tests"], diff --git a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.bp b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.bp index d439124c72cb..c9fdec0e61fd 100644 --- a/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.bp +++ b/core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.bp @@ -27,8 +27,8 @@ android_test { "junit", ], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], platform_apis: true, diff --git a/core/tests/mockingcoretests/Android.bp b/core/tests/mockingcoretests/Android.bp index aca52a870655..8301a7f5c80a 100644 --- a/core/tests/mockingcoretests/Android.bp +++ b/core/tests/mockingcoretests/Android.bp @@ -44,9 +44,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", ], // These are not normally accessible from apps so they must be explicitly included. diff --git a/core/tests/packagemanagertests/Android.bp b/core/tests/packagemanagertests/Android.bp index 5ce71c902c7c..8ff499826866 100644 --- a/core/tests/packagemanagertests/Android.bp +++ b/core/tests/packagemanagertests/Android.bp @@ -17,7 +17,7 @@ android_test { "frameworks-base-testutils", "mockito-target-minus-junit4", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], platform_apis: true, certificate: "platform", } diff --git a/core/tests/packagemonitortests/Android.bp b/core/tests/packagemonitortests/Android.bp index b08850e90d28..c3b084e4368e 100644 --- a/core/tests/packagemonitortests/Android.bp +++ b/core/tests/packagemonitortests/Android.bp @@ -34,7 +34,7 @@ android_test { "mockito-target-minus-junit4", "truth", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], platform_apis: true, certificate: "platform", test_suites: ["device-tests"], @@ -52,7 +52,7 @@ android_test { "compatibility-device-util-axt", "frameworks-base-testutils", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], platform_apis: true, certificate: "platform", test_suites: ["device-tests"], diff --git a/core/tests/privacytests/Android.bp b/core/tests/privacytests/Android.bp index 4e24cd5d91cb..ac9cede84483 100644 --- a/core/tests/privacytests/Android.bp +++ b/core/tests/privacytests/Android.bp @@ -16,7 +16,7 @@ android_test { "androidx.test.rules", "truth", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], platform_apis: true, certificate: "platform", test_suites: ["device-tests"], diff --git a/core/tests/screenshothelpertests/Android.bp b/core/tests/screenshothelpertests/Android.bp index 3c71e6e4247b..49c3ee94bfd0 100644 --- a/core/tests/screenshothelpertests/Android.bp +++ b/core/tests/screenshothelpertests/Android.bp @@ -25,9 +25,9 @@ android_test { ], 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", ], platform_apis: true, diff --git a/core/tests/systemproperties/Android.bp b/core/tests/systemproperties/Android.bp index ed52cccfb9b9..ed99a1f5cc4a 100644 --- a/core/tests/systemproperties/Android.bp +++ b/core/tests/systemproperties/Android.bp @@ -20,8 +20,8 @@ android_test { "ravenwood-junit", ], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], platform_apis: true, certificate: "platform", @@ -37,8 +37,8 @@ android_ravenwood_test { "ravenwood-junit", ], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], srcs: [ "src/**/*.java", diff --git a/core/tests/timetests/Android.bp b/core/tests/timetests/Android.bp index 51181a8a7b13..89dade7f8fa0 100644 --- a/core/tests/timetests/Android.bp +++ b/core/tests/timetests/Android.bp @@ -19,7 +19,7 @@ android_test { "platform-test-annotations", "truth", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], certificate: "platform", test_suites: ["device-tests"], } diff --git a/core/tests/utillib/Android.bp b/core/tests/utillib/Android.bp index 1d5c16c7a536..b6f046bd12d5 100644 --- a/core/tests/utillib/Android.bp +++ b/core/tests/utillib/Android.bp @@ -28,5 +28,5 @@ java_library { srcs: ["**/*.java"], static_libs: ["junit"], - libs: ["android.test.base"], + libs: ["android.test.base.stubs"], } diff --git a/core/tests/utiltests/Android.bp b/core/tests/utiltests/Android.bp index f5563a710563..cdc8a9e06d0b 100644 --- a/core/tests/utiltests/Android.bp +++ b/core/tests/utiltests/Android.bp @@ -39,9 +39,9 @@ android_test { ], 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", ], platform_apis: true, @@ -55,7 +55,7 @@ android_test { android_ravenwood_test { name: "FrameworksUtilTestsRavenwood", libs: [ - "android.test.mock", + "android.test.mock.stubs.system", ], static_libs: [ "androidx.annotation_annotation", diff --git a/core/tests/vibrator/Android.bp b/core/tests/vibrator/Android.bp index 920ab5914548..848e079a2270 100644 --- a/core/tests/vibrator/Android.bp +++ b/core/tests/vibrator/Android.bp @@ -25,9 +25,9 @@ android_test { ], libs: [ - "android.test.runner", - "android.test.base", - "android.test.mock", + "android.test.runner.stubs", + "android.test.base.stubs", + "android.test.mock.stubs", "framework", "framework-res", ], diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp index 7de45233494b..0dcf597644ee 100644 --- a/keystore/tests/Android.bp +++ b/keystore/tests/Android.bp @@ -31,6 +31,6 @@ android_test { "mockito-target-minus-junit4", ], platform_apis: true, - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], certificate: "platform", } diff --git a/libs/WindowManager/Jetpack/tests/unittest/Android.bp b/libs/WindowManager/Jetpack/tests/unittest/Android.bp index 139ddda5af3c..bc46b70793cd 100644 --- a/libs/WindowManager/Jetpack/tests/unittest/Android.bp +++ b/libs/WindowManager/Jetpack/tests/unittest/Android.bp @@ -47,9 +47,9 @@ android_test { ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], // These are not normally accessible from apps so they must be explicitly included. diff --git a/libs/WindowManager/Shell/multivalentTests/Android.bp b/libs/WindowManager/Shell/multivalentTests/Android.bp index 1ad19c9f3033..ee0d5bbed324 100644 --- a/libs/WindowManager/Shell/multivalentTests/Android.bp +++ b/libs/WindowManager/Shell/multivalentTests/Android.bp @@ -77,8 +77,8 @@ android_test { "platform-test-rules", ], libs: [ - "android.test.base", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], jni_libs: [ "libdexmakerjvmtiagent", diff --git a/libs/WindowManager/Shell/tests/flicker/Android.bp b/libs/WindowManager/Shell/tests/flicker/Android.bp index 4abaf5bd4a38..4058fa977f1d 100644 --- a/libs/WindowManager/Shell/tests/flicker/Android.bp +++ b/libs/WindowManager/Shell/tests/flicker/Android.bp @@ -59,7 +59,7 @@ java_defaults { enabled: false, }, test_suites: ["device-tests"], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], static_libs: [ "wm-shell-flicker-utils", "androidx.test.ext.junit", diff --git a/libs/WindowManager/Shell/tests/unittest/Android.bp b/libs/WindowManager/Shell/tests/unittest/Android.bp index 4d761e18b990..9cbdcdb12d0a 100644 --- a/libs/WindowManager/Shell/tests/unittest/Android.bp +++ b/libs/WindowManager/Shell/tests/unittest/Android.bp @@ -66,9 +66,9 @@ android_test { ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], jni_libs: [ diff --git a/libs/dream/lowlight/tests/Android.bp b/libs/dream/lowlight/tests/Android.bp index 42547832133b..d3e101681ef2 100644 --- a/libs/dream/lowlight/tests/Android.bp +++ b/libs/dream/lowlight/tests/Android.bp @@ -37,9 +37,9 @@ android_test { "truth", ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], jni_libs: [ "libdexmakerjvmtiagent", diff --git a/libs/securebox/tests/Android.bp b/libs/securebox/tests/Android.bp index 80b501da1aa5..8429cf4116c5 100644 --- a/libs/securebox/tests/Android.bp +++ b/libs/securebox/tests/Android.bp @@ -35,9 +35,9 @@ android_test { "truth", ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], jni_libs: [ "libdexmakerjvmtiagent", diff --git a/media/lib/tvremote/tests/Android.bp b/media/lib/tvremote/tests/Android.bp index 280c515e9a9e..83061cf14b0f 100644 --- a/media/lib/tvremote/tests/Android.bp +++ b/media/lib/tvremote/tests/Android.bp @@ -11,9 +11,9 @@ android_test { name: "TvRemoteTests", srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "android.test.base", - "com.android.media.tv.remoteprovider", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", + "com.android.media.tv.remoteprovider.impl", ], static_libs: [ "mockito-target-minus-junit4", diff --git a/media/mca/tests/Android.bp b/media/mca/tests/Android.bp index 04f083dee093..463e131f1dfd 100644 --- a/media/mca/tests/Android.bp +++ b/media/mca/tests/Android.bp @@ -10,8 +10,8 @@ package { android_test { name: "CameraEffectsTests", libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "junit", diff --git a/media/packages/BluetoothMidiService/tests/unit/Android.bp b/media/packages/BluetoothMidiService/tests/unit/Android.bp index 67c7e4230f30..54d6dfc658ed 100644 --- a/media/packages/BluetoothMidiService/tests/unit/Android.bp +++ b/media/packages/BluetoothMidiService/tests/unit/Android.bp @@ -39,8 +39,8 @@ android_test { test_suites: ["device-tests"], libs: [ "framework-res", - "android.test.runner", - "android.test.base", - "android.test.mock", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", + "android.test.mock.stubs.system", ], } diff --git a/media/tests/MediaFrameworkTest/Android.bp b/media/tests/MediaFrameworkTest/Android.bp index 028c97ec51f7..571e24f16c78 100644 --- a/media/tests/MediaFrameworkTest/Android.bp +++ b/media/tests/MediaFrameworkTest/Android.bp @@ -11,9 +11,9 @@ android_test { name: "mediaframeworktest", srcs: ["**/*.java"], 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", ], static_libs: [ "mockito-target-inline-minus-junit4", diff --git a/media/tests/MediaRouter/Android.bp b/media/tests/MediaRouter/Android.bp index d21cb9319885..e4f88a65ed1a 100644 --- a/media/tests/MediaRouter/Android.bp +++ b/media/tests/MediaRouter/Android.bp @@ -14,8 +14,8 @@ android_test { srcs: ["**/*.java"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ diff --git a/media/tests/TunerTest/Android.bp b/media/tests/TunerTest/Android.bp index 8e8816cee876..634438e72b59 100644 --- a/media/tests/TunerTest/Android.bp +++ b/media/tests/TunerTest/Android.bp @@ -13,14 +13,14 @@ android_test { srcs: ["**/*.java"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "androidx.test.rules", "compatibility-device-util-axt", - "testng" + "testng", ], platform_apis: true, diff --git a/media/tests/projection/Android.bp b/media/tests/projection/Android.bp index fd5f19535537..94db2c02eb28 100644 --- a/media/tests/projection/Android.bp +++ b/media/tests/projection/Android.bp @@ -18,9 +18,9 @@ android_test { srcs: ["**/*.java"], 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: [ diff --git a/nfc/Android.bp b/nfc/Android.bp index 0282e6f5c246..db3dcb0631dd 100644 --- a/nfc/Android.bp +++ b/nfc/Android.bp @@ -38,8 +38,8 @@ java_sdk_library { name: "framework-nfc", libs: [ "unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage - "framework-permission-s", - "framework-permission", + "framework-permission-s.stubs.module_lib", + "framework-permission.stubs.module_lib", ], static_libs: [ "android.nfc.flags-aconfig-java", diff --git a/nfc/tests/Android.bp b/nfc/tests/Android.bp index 6ebc03cc6ffc..bfa814d149f0 100644 --- a/nfc/tests/Android.bp +++ b/nfc/tests/Android.bp @@ -32,7 +32,7 @@ android_test { ], libs: [ "framework-nfc.impl", - "android.test.runner", + "android.test.runner.stubs.system", ], srcs: ["src/**/*.java"], platform_apis: true, diff --git a/packages/CarrierDefaultApp/tests/unit/Android.bp b/packages/CarrierDefaultApp/tests/unit/Android.bp index 0d08ec6ca2b3..bec81ad5f92e 100644 --- a/packages/CarrierDefaultApp/tests/unit/Android.bp +++ b/packages/CarrierDefaultApp/tests/unit/Android.bp @@ -25,8 +25,8 @@ android_test { name: "CarrierDefaultAppUnitTests", certificate: "platform", libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", "SlicePurchaseController", ], static_libs: [ diff --git a/packages/CredentialManager/tests/robotests/Android.bp b/packages/CredentialManager/tests/robotests/Android.bp index 75a0dcce0b9e..27afaaa49fdd 100644 --- a/packages/CredentialManager/tests/robotests/Android.bp +++ b/packages/CredentialManager/tests/robotests/Android.bp @@ -48,9 +48,9 @@ android_robolectric_test { "flag-junit-base", ], 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", ], upstream: true, diff --git a/packages/ExternalStorageProvider/tests/Android.bp b/packages/ExternalStorageProvider/tests/Android.bp index 097bb8603877..56348b77e679 100644 --- a/packages/ExternalStorageProvider/tests/Android.bp +++ b/packages/ExternalStorageProvider/tests/Android.bp @@ -21,9 +21,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: [ diff --git a/packages/FusedLocation/Android.bp b/packages/FusedLocation/Android.bp index 61a82701d155..719aa28a4e30 100644 --- a/packages/FusedLocation/Android.bp +++ b/packages/FusedLocation/Android.bp @@ -35,7 +35,7 @@ android_app { name: "FusedLocation", defaults: ["platform_app_defaults"], srcs: ["src/**/*.java"], - libs: ["com.android.location.provider"], + libs: ["com.android.location.provider.impl"], platform_apis: true, certificate: "platform", privileged: true, @@ -50,9 +50,9 @@ android_test { "src/**/*.java", // include real sources because we're forced to test this directly ], libs: [ - "android.test.base", - "android.test.runner", - "com.android.location.provider", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", + "com.android.location.provider.impl", ], static_libs: [ "androidx.test.core", diff --git a/packages/SettingsLib/Spa/screenshot/robotests/Android.bp b/packages/SettingsLib/Spa/screenshot/robotests/Android.bp index c834c80ad536..f6477e2f052a 100644 --- a/packages/SettingsLib/Spa/screenshot/robotests/Android.bp +++ b/packages/SettingsLib/Spa/screenshot/robotests/Android.bp @@ -63,9 +63,9 @@ android_robolectric_test { "uiautomator-helpers", ], 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", ], upstream: true, diff --git a/packages/SettingsLib/tests/integ/Android.bp b/packages/SettingsLib/tests/integ/Android.bp index 33d23a3ea16a..15fe8ed6d3ba 100644 --- a/packages/SettingsLib/tests/integ/Android.bp +++ b/packages/SettingsLib/tests/integ/Android.bp @@ -37,10 +37,10 @@ android_test { ], libs: [ - "android.test.runner", + "android.test.runner.stubs", "telephony-common", - "android.test.base", - "android.test.mock", + "android.test.base.stubs", + "android.test.mock.stubs", "truth", ], diff --git a/packages/SettingsProvider/Android.bp b/packages/SettingsProvider/Android.bp index 3e62b7b2cf6e..c107ff5a34ce 100644 --- a/packages/SettingsProvider/Android.bp +++ b/packages/SettingsProvider/Android.bp @@ -76,8 +76,8 @@ android_test { "Harrier", ], libs: [ - "android.test.base", - "android.test.mock", + "android.test.base.stubs.system", + "android.test.mock.stubs.system", "unsupportedappusage", ], resource_dirs: [], diff --git a/packages/Shell/tests/Android.bp b/packages/Shell/tests/Android.bp index 0dc331478997..6399ffdfdf2f 100644 --- a/packages/Shell/tests/Android.bp +++ b/packages/Shell/tests/Android.bp @@ -11,9 +11,9 @@ android_test { name: "ShellTests", srcs: ["src/**/*.java"], 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", ], static_libs: [ "androidx.test.rules", diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index d26a9066e075..f0e586388927 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -804,9 +804,9 @@ android_library { "androidx.test.rules", ], 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", "keepanno-annotations", ], kotlincflags: [ @@ -896,9 +896,9 @@ android_robolectric_test { "androidx.compose.runtime_runtime", ], 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", ], @@ -971,9 +971,9 @@ android_ravenwood_test { "androidx.compose.runtime_runtime", ], 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", ], auto_gen_config: true, plugins: [ diff --git a/packages/SystemUI/accessibility/accessibilitymenu/tests/Android.bp b/packages/SystemUI/accessibility/accessibilitymenu/tests/Android.bp index 9d5a2e0dba4b..a48476744eeb 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/tests/Android.bp +++ b/packages/SystemUI/accessibility/accessibilitymenu/tests/Android.bp @@ -24,8 +24,8 @@ android_test { use_resource_processor: true, certificate: "platform", libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "androidx.test.core", diff --git a/packages/SystemUI/tests/Android.bp b/packages/SystemUI/tests/Android.bp index 88939a2ba67d..957ed875e0e7 100644 --- a/packages/SystemUI/tests/Android.bp +++ b/packages/SystemUI/tests/Android.bp @@ -35,9 +35,9 @@ android_test { "libstaticjvmtiagent", ], libs: [ - "android.test.runner", + "android.test.runner.stubs.system", "telephony-common", - "android.test.base", + "android.test.base.stubs.system", ], aaptflags: [ "--extra-packages com.android.systemui", diff --git a/packages/VpnDialogs/tests/Android.bp b/packages/VpnDialogs/tests/Android.bp index 68639bd1c4fe..409282efb714 100644 --- a/packages/VpnDialogs/tests/Android.bp +++ b/packages/VpnDialogs/tests/Android.bp @@ -22,8 +22,8 @@ android_test { // (e.g. VpnManager#prepareVpn()). certificate: "platform", libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "androidx.test.core", diff --git a/packages/WAPPushManager/tests/Android.bp b/packages/WAPPushManager/tests/Android.bp index 0a179383fab6..973100248a2b 100644 --- a/packages/WAPPushManager/tests/Android.bp +++ b/packages/WAPPushManager/tests/Android.bp @@ -26,9 +26,9 @@ package { android_test { name: "WAPPushManagerTests", libs: [ - "android.test.runner", + "android.test.runner.stubs.system", "telephony-common", - "android.test.base", + "android.test.base.stubs.system", ], static_libs: ["junit"], // Include all test java files. diff --git a/packages/WallpaperBackup/Android.bp b/packages/WallpaperBackup/Android.bp index 18f783146c72..b8e0d427f3d8 100644 --- a/packages/WallpaperBackup/Android.bp +++ b/packages/WallpaperBackup/Android.bp @@ -42,8 +42,8 @@ android_test { "test/src/**/*.java", ], libs: [ - "android.test.base", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], static_libs: [ "androidx.test.core", diff --git a/packages/overlays/tests/Android.bp b/packages/overlays/tests/Android.bp index 0244c0fe0533..8bbe60059d45 100644 --- a/packages/overlays/tests/Android.bp +++ b/packages/overlays/tests/Android.bp @@ -26,8 +26,8 @@ android_test { certificate: "platform", srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], platform_apis: true, static_libs: [ diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp index 9b0c8e554d64..d6b25fc0ea07 100644 --- a/ravenwood/Android.bp +++ b/ravenwood/Android.bp @@ -155,14 +155,13 @@ java_library { "ravenwood-runtime-common", ], libs: [ - "android.test.mock", + "android.test.mock.impl", "framework-minus-apex.ravenwood", "ravenwood-framework", "services.core.ravenwood", "junit", "framework-annotations-lib", ], - sdk_version: "core_current", visibility: ["//frameworks/base"], jarjar_rules: ":ravenwood-services-jarjar-rules", } diff --git a/ravenwood/mockito/Android.bp b/ravenwood/mockito/Android.bp index 95c7394b19f3..d91537bbc334 100644 --- a/ravenwood/mockito/Android.bp +++ b/ravenwood/mockito/Android.bp @@ -21,9 +21,9 @@ android_ravenwood_test { "truth", ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], auto_gen_config: true, } @@ -48,9 +48,9 @@ android_test { "mockito-target-extended-minus-junit4", ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], jni_libs: [ // Required by mockito diff --git a/sax/tests/saxtests/Android.bp b/sax/tests/saxtests/Android.bp index 446ee9394179..29c742f47868 100644 --- a/sax/tests/saxtests/Android.bp +++ b/sax/tests/saxtests/Android.bp @@ -12,8 +12,8 @@ android_test { // Include all test java files. srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "junit", diff --git a/services/foldables/devicestateprovider/tests/Android.bp b/services/foldables/devicestateprovider/tests/Android.bp index 84a6df38e0a0..4352c15879e1 100644 --- a/services/foldables/devicestateprovider/tests/Android.bp +++ b/services/foldables/devicestateprovider/tests/Android.bp @@ -6,9 +6,9 @@ android_test { name: "foldable-device-state-provider-tests", srcs: ["src/**/*.java"], 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", ], jni_libs: [ "libdexmakerjvmtiagent", diff --git a/services/tests/InputMethodSystemServerTests/Android.bp b/services/tests/InputMethodSystemServerTests/Android.bp index 3bce9b54e320..a78972dae163 100644 --- a/services/tests/InputMethodSystemServerTests/Android.bp +++ b/services/tests/InputMethodSystemServerTests/Android.bp @@ -50,9 +50,9 @@ android_test { ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], data: [ @@ -79,8 +79,8 @@ android_ravenwood_test { "services", ], libs: [ - "android.test.base", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], srcs: [ "src/com/android/server/inputmethod/**/ClientControllerTest.java", @@ -121,9 +121,9 @@ android_test { ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], data: [ diff --git a/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp b/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp index 73cec6c13d6d..71ada2e973ce 100644 --- a/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp +++ b/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp @@ -29,7 +29,7 @@ android_test_helper_app { sdk_version: "test_current", srcs: ["src/**/*.kt"], libs: [ - "android.test.base", + "android.test.base.stubs.test", ], static_libs: [ "androidx.annotation_annotation", diff --git a/services/tests/PackageManagerServiceTests/server/Android.bp b/services/tests/PackageManagerServiceTests/server/Android.bp index 598e27372075..b8f1e8304c2f 100644 --- a/services/tests/PackageManagerServiceTests/server/Android.bp +++ b/services/tests/PackageManagerServiceTests/server/Android.bp @@ -65,9 +65,9 @@ android_test { "android.hardware.tv.cec-V1.0-java", "android.hardware.vibrator-V3-java", "android.hidl.manager-V1.0-java", - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], platform_apis: true, diff --git a/services/tests/VpnTests/Android.bp b/services/tests/VpnTests/Android.bp index a5011a8d8b00..ee20f1a105a4 100644 --- a/services/tests/VpnTests/Android.bp +++ b/services/tests/VpnTests/Android.bp @@ -38,8 +38,8 @@ android_test { "framework-connectivity-t.impl", "framework", "framework-res", - "android.test.runner", - "android.test.base", - "android.test.mock", + "android.test.runner.stubs", + "android.test.base.stubs", + "android.test.mock.stubs", ], } diff --git a/services/tests/displayservicetests/Android.bp b/services/tests/displayservicetests/Android.bp index 3bafe7296fff..f9441b284e7a 100644 --- a/services/tests/displayservicetests/Android.bp +++ b/services/tests/displayservicetests/Android.bp @@ -16,7 +16,7 @@ android_test { ], libs: [ - "android.test.mock", + "android.test.mock.stubs.system", ], static_libs: [ diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp index 9808d54202e5..3c714a45d9b2 100644 --- a/services/tests/mockingservicestests/Android.bp +++ b/services/tests/mockingservicestests/Android.bp @@ -80,9 +80,9 @@ android_test { ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", "servicestests-core-utils", ], @@ -118,14 +118,14 @@ java_library { "mockito-target-extended-minus-junit4", ], libs: [ - "android.test.runner", + "android.test.runner.stubs.system", ], } android_ravenwood_test { name: "FrameworksMockingServicesTestsRavenwood", libs: [ - "android.test.mock", + "android.test.mock.stubs.system", ], static_libs: [ "androidx.annotation_annotation", diff --git a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp index e94b8ad0a9ac..0ae304cb6b02 100644 --- a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp +++ b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp @@ -37,9 +37,9 @@ android_test { ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], jni_libs: [ diff --git a/services/tests/powerservicetests/Android.bp b/services/tests/powerservicetests/Android.bp index 729dcbd11f42..2beb15371558 100644 --- a/services/tests/powerservicetests/Android.bp +++ b/services/tests/powerservicetests/Android.bp @@ -23,7 +23,7 @@ android_test { ], libs: [ - "android.test.mock", + "android.test.mock.stubs.system", ], defaults: [ diff --git a/services/tests/powerstatstests/Android.bp b/services/tests/powerstatstests/Android.bp index b2a5b02c49e1..129d6838c52a 100644 --- a/services/tests/powerstatstests/Android.bp +++ b/services/tests/powerstatstests/Android.bp @@ -30,7 +30,7 @@ android_test { ], libs: [ - "android.test.base", + "android.test.base.stubs.system", ], resource_dirs: ["res/"], diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index 09f81f736b36..b58870bc95fb 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -96,9 +96,9 @@ android_test { "android.hardware.tv.cec-V1.0-java", "android.hardware.vibrator-V3-java", "android.hidl.manager-V1.0-java", - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], platform_apis: true, @@ -152,7 +152,7 @@ android_test { android_ravenwood_test { name: "FrameworksServicesTestsRavenwood", libs: [ - "android.test.mock", + "android.test.mock.stubs.system", ], static_libs: [ "androidx.annotation_annotation", @@ -192,8 +192,8 @@ java_library { "src/com/android/server/devicepolicy/MockUtils.java", ], libs: [ - "android.test.mock", - "android.test.base", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", "mockito-target-minus-junit4", ], static_libs: [ @@ -218,7 +218,7 @@ java_library { "mockito-target-minus-junit4", ], libs: [ - "android.test.runner", + "android.test.runner.stubs.system", ], } @@ -244,7 +244,7 @@ java_library { "mockito-target-extended-minus-junit4", ], libs: [ - "android.test.runner", + "android.test.runner.stubs.system", ], } diff --git a/services/tests/timetests/Android.bp b/services/tests/timetests/Android.bp index 23ab85996fff..7a4b9749b0e2 100644 --- a/services/tests/timetests/Android.bp +++ b/services/tests/timetests/Android.bp @@ -20,7 +20,7 @@ android_test { "services.core", "truth", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], platform_apis: true, certificate: "platform", test_suites: ["device-tests"], diff --git a/services/tests/uiservicestests/Android.bp b/services/tests/uiservicestests/Android.bp index e6cf0c38a10c..850d2f7f36a5 100644 --- a/services/tests/uiservicestests/Android.bp +++ b/services/tests/uiservicestests/Android.bp @@ -54,9 +54,9 @@ android_test { ], 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", ], dxflags: ["--multi-dex"], diff --git a/services/tests/vibrator/Android.bp b/services/tests/vibrator/Android.bp index 2549ff5360ec..ed18c8b04c0f 100644 --- a/services/tests/vibrator/Android.bp +++ b/services/tests/vibrator/Android.bp @@ -17,9 +17,9 @@ android_test { libs: [ "android.hardware.vibrator-V3-java", - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], static_libs: [ diff --git a/services/tests/voiceinteractiontests/Android.bp b/services/tests/voiceinteractiontests/Android.bp index 8c70851f87df..5fbf02cfc984 100644 --- a/services/tests/voiceinteractiontests/Android.bp +++ b/services/tests/voiceinteractiontests/Android.bp @@ -49,9 +49,9 @@ android_test { ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], certificate: "platform", diff --git a/services/tests/wmtests/Android.bp b/services/tests/wmtests/Android.bp index 604869c7f0ca..fef5d4cc848a 100644 --- a/services/tests/wmtests/Android.bp +++ b/services/tests/wmtests/Android.bp @@ -76,9 +76,9 @@ android_test { libs: [ "android.hardware.power-V1-java", - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], defaults: [ diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 6b5be3cba204..bb2c4d97c87a 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -32,14 +32,28 @@ java_sdk_library { javacflags: ["-Xep:DepAnn:ERROR"], }, - libs: [ - "android.test.base", - "android.test.mock", - ], - stub_only_libs: [ - "android.test.base", - "android.test.mock", + impl_only_libs: [ + "android.test.base.impl", + "android.test.mock.impl", ], + public: { + libs: [ + "android.test.base.stubs", + "android.test.mock.stubs", + ], + }, + system: { + libs: [ + "android.test.base.stubs.system", + "android.test.mock.stubs.system", + ], + }, + test: { + libs: [ + "android.test.base.stubs.test", + "android.test.mock.stubs.test", + ], + }, api_packages: [ "android.test", "android.test.suitebuilder", @@ -64,7 +78,7 @@ java_library { sdk_version: "current", libs: [ "android.test.base_static", - "android.test.mock", + "android.test.mock.stubs", "junit", ], } diff --git a/test-runner/tests/Android.bp b/test-runner/tests/Android.bp index 0c0c0805f2d3..39f41ed7f667 100644 --- a/test-runner/tests/Android.bp +++ b/test-runner/tests/Android.bp @@ -30,8 +30,8 @@ android_test { libs: [ "android.test.runner.impl", - "android.test.base", - "android.test.mock", + "android.test.base.stubs.system", + "android.test.mock.stubs.system", ], static_libs: [ "junit", diff --git a/tests/AppLaunch/Android.bp b/tests/AppLaunch/Android.bp index f838c5a80c28..90a00fe6083e 100644 --- a/tests/AppLaunch/Android.bp +++ b/tests/AppLaunch/Android.bp @@ -14,11 +14,12 @@ android_test { platform_apis: true, certificate: "platform", libs: [ - "android.test.base", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], static_libs: [ "androidx.test.rules", - "ub-uiautomator"], + "ub-uiautomator", + ], test_suites: ["device-tests"], } diff --git a/tests/AttestationVerificationTest/Android.bp b/tests/AttestationVerificationTest/Android.bp index b98f8cb0c21d..5f0908959ed5 100644 --- a/tests/AttestationVerificationTest/Android.bp +++ b/tests/AttestationVerificationTest/Android.bp @@ -32,8 +32,8 @@ android_test { }, test_suites: ["device-tests"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "compatibility-device-util-axt", diff --git a/tests/BrowserPowerTest/Android.bp b/tests/BrowserPowerTest/Android.bp index a8a9897c0e86..100e975b4d5e 100644 --- a/tests/BrowserPowerTest/Android.bp +++ b/tests/BrowserPowerTest/Android.bp @@ -24,8 +24,8 @@ package { android_test { name: "BrowserPowerTests", libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: ["junit"], // Include all test java files. diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.bp b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.bp index 5edb1de9586e..4aeca5b04602 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.bp +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.bp @@ -24,7 +24,7 @@ android_test { name: "SmartCamera-tests", platform_apis: true, srcs: ["src/**/*.java"], - libs: ["android.test.base"], + libs: ["android.test.base.stubs.system"], static_libs: [ "guava", "junit", diff --git a/tests/ChoreographerTests/Android.bp b/tests/ChoreographerTests/Android.bp index 3f48d70d659f..69a9d180bfd3 100644 --- a/tests/ChoreographerTests/Android.bp +++ b/tests/ChoreographerTests/Android.bp @@ -26,8 +26,8 @@ android_test { name: "ChoreographerTests", srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "androidx.test.core", diff --git a/tests/CompanionDeviceMultiDeviceTests/client/Android.bp b/tests/CompanionDeviceMultiDeviceTests/client/Android.bp index 9994826d061a..ce63fe89fe2e 100644 --- a/tests/CompanionDeviceMultiDeviceTests/client/Android.bp +++ b/tests/CompanionDeviceMultiDeviceTests/client/Android.bp @@ -40,8 +40,8 @@ android_test { "mobly-snippet-lib", ], libs: [ - "android.test.base", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], optimize: { diff --git a/tests/CoreTests/android/Android.bp b/tests/CoreTests/android/Android.bp index 97a6e5fd4d1b..85e951e099ce 100644 --- a/tests/CoreTests/android/Android.bp +++ b/tests/CoreTests/android/Android.bp @@ -12,7 +12,7 @@ android_test { srcs: ["**/*.java"], libs: [ "android.test.runner.stubs", - "org.apache.http.legacy", + "org.apache.http.legacy.stubs", "android.test.base.stubs", ], sdk_version: "current", diff --git a/tests/CtsSurfaceControlTestsStaging/Android.bp b/tests/CtsSurfaceControlTestsStaging/Android.bp index 1038c9e93931..8d93b28b9acb 100644 --- a/tests/CtsSurfaceControlTestsStaging/Android.bp +++ b/tests/CtsSurfaceControlTestsStaging/Android.bp @@ -28,8 +28,8 @@ android_test { name: "CtsSurfaceControlTestsStaging", srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: [ "androidx.test.core", diff --git a/tests/DataIdleTest/Android.bp b/tests/DataIdleTest/Android.bp index f9509cc9a4bf..8839df664abf 100644 --- a/tests/DataIdleTest/Android.bp +++ b/tests/DataIdleTest/Android.bp @@ -27,8 +27,8 @@ android_test { name: "DataIdleTest", platform_apis: true, libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: ["junit"], srcs: ["src/**/*.java"], diff --git a/tests/EnforcePermission/perf-app/Android.bp b/tests/EnforcePermission/perf-app/Android.bp index 6d04fdc821bb..dbafd739c7bc 100644 --- a/tests/EnforcePermission/perf-app/Android.bp +++ b/tests/EnforcePermission/perf-app/Android.bp @@ -32,8 +32,8 @@ android_test { "androidx.test.rules", ], libs: [ - "android.test.base", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], data: [ ":EnforcePermissionTestHelper", diff --git a/tests/EnforcePermission/test-app/Android.bp b/tests/EnforcePermission/test-app/Android.bp index 065ab33448e3..64f850b1e147 100644 --- a/tests/EnforcePermission/test-app/Android.bp +++ b/tests/EnforcePermission/test-app/Android.bp @@ -27,8 +27,8 @@ android_test { "androidx.test.rules", ], libs: [ - "android.test.base", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], data: [ ":EnforcePermissionTestHelper", diff --git a/tests/FlickerTests/Android.bp b/tests/FlickerTests/Android.bp index d658d5991a57..27e9ffa4cea5 100644 --- a/tests/FlickerTests/Android.bp +++ b/tests/FlickerTests/Android.bp @@ -31,7 +31,7 @@ java_defaults { enabled: false, }, test_suites: ["device-tests"], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], static_libs: [ "androidx.test.ext.junit", "flickertestapplib", diff --git a/tests/FrameworkPerf/Android.bp b/tests/FrameworkPerf/Android.bp index 9be3ab795b86..4e39fe1c5e4a 100644 --- a/tests/FrameworkPerf/Android.bp +++ b/tests/FrameworkPerf/Android.bp @@ -12,8 +12,8 @@ android_test { srcs: ["**/*.java"], platform_apis: true, libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: ["junit"], aaptflags: [ diff --git a/tests/GamePerformance/Android.bp b/tests/GamePerformance/Android.bp index f250a1bbdaca..964f0b914c65 100644 --- a/tests/GamePerformance/Android.bp +++ b/tests/GamePerformance/Android.bp @@ -33,8 +33,8 @@ android_test_helper_app { srcs: ["src/**/*.java"], static_libs: ["androidx.test.rules"], libs: [ - "android.test.base", - "android.test.runner", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], platform_apis: true, certificate: "platform", diff --git a/tests/Input/Android.bp b/tests/Input/Android.bp index 06c2651b604d..cf42a349b3a2 100644 --- a/tests/Input/Android.bp +++ b/tests/Input/Android.bp @@ -51,8 +51,8 @@ android_test { "ui-trace-collector", ], libs: [ - "android.test.mock", - "android.test.base", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", ], test_suites: ["device-tests"], } diff --git a/tests/InputMethodStressTest/Android.bp b/tests/InputMethodStressTest/Android.bp index 5ed8d8d528c4..2697d32dd622 100644 --- a/tests/InputMethodStressTest/Android.bp +++ b/tests/InputMethodStressTest/Android.bp @@ -20,7 +20,7 @@ package { android_test { name: "InputMethodStressTest", srcs: ["src/**/*.java"], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs"], static_libs: [ "androidx.test.ext.junit", "androidx.test.uiautomator_uiautomator", diff --git a/tests/InputScreenshotTest/Android.bp b/tests/InputScreenshotTest/Android.bp index 927b101012c5..12ab550c2da2 100644 --- a/tests/InputScreenshotTest/Android.bp +++ b/tests/InputScreenshotTest/Android.bp @@ -67,8 +67,8 @@ android_test { "truth", ], libs: [ - "android.test.mock", - "android.test.base", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", ], test_suites: ["device-tests"], compile_multilib: "both", diff --git a/tests/InputScreenshotTest/robotests/Android.bp b/tests/InputScreenshotTest/robotests/Android.bp index d63fd69ae4d9..b2414a85c095 100644 --- a/tests/InputScreenshotTest/robotests/Android.bp +++ b/tests/InputScreenshotTest/robotests/Android.bp @@ -61,9 +61,9 @@ android_robolectric_test { "uiautomator-helpers", ], 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", ], upstream: true, diff --git a/tests/Internal/Android.bp b/tests/Internal/Android.bp index ad98e47fa8f0..3e58517579b8 100644 --- a/tests/Internal/Android.bp +++ b/tests/Internal/Android.bp @@ -14,7 +14,7 @@ android_test { }, // Include some source files directly to be able to access package members srcs: ["src/**/*.java"], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], static_libs: [ "junit", "androidx.test.rules", diff --git a/tests/LocalizationTest/Android.bp b/tests/LocalizationTest/Android.bp index 909ca5972552..5d9901bb4d0d 100644 --- a/tests/LocalizationTest/Android.bp +++ b/tests/LocalizationTest/Android.bp @@ -25,9 +25,9 @@ android_test { name: "LocalizationTest", srcs: ["java/**/*.kt"], 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", ], static_libs: [ "androidx.test.core", diff --git a/tests/MemoryUsage/Android.bp b/tests/MemoryUsage/Android.bp index e30a0a7cd8b5..deb46636e5b2 100644 --- a/tests/MemoryUsage/Android.bp +++ b/tests/MemoryUsage/Android.bp @@ -14,8 +14,8 @@ android_test { platform_apis: true, certificate: "platform", libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: ["junit"], } diff --git a/tests/MultiUser/Android.bp b/tests/MultiUser/Android.bp index bde309fe3015..e4d9f02b3d02 100644 --- a/tests/MultiUser/Android.bp +++ b/tests/MultiUser/Android.bp @@ -18,9 +18,9 @@ android_test { "services.core", ], 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", ], certificate: "platform", test_suites: ["device-tests"], diff --git a/tests/NetworkSecurityConfigTest/Android.bp b/tests/NetworkSecurityConfigTest/Android.bp index 473eadbcad73..4c48eaa4622e 100644 --- a/tests/NetworkSecurityConfigTest/Android.bp +++ b/tests/NetworkSecurityConfigTest/Android.bp @@ -11,8 +11,8 @@ android_test { name: "NetworkSecurityConfigTests", certificate: "platform", libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], static_libs: ["junit"], // Include all test java files. diff --git a/tests/OneMedia/Android.bp b/tests/OneMedia/Android.bp index a43cd39f0dcb..a1817ccb662a 100644 --- a/tests/OneMedia/Android.bp +++ b/tests/OneMedia/Android.bp @@ -15,7 +15,7 @@ android_app { ], platform_apis: true, certificate: "platform", - libs: ["org.apache.http.legacy"], + libs: ["org.apache.http.legacy.stubs.system"], optional_uses_libs: ["org.apache.http.legacy"], optimize: { enabled: false, diff --git a/tests/PackageWatchdog/Android.bp b/tests/PackageWatchdog/Android.bp index 2c5fdd3228ed..096555eb3056 100644 --- a/tests/PackageWatchdog/Android.bp +++ b/tests/PackageWatchdog/Android.bp @@ -36,7 +36,7 @@ android_test { "services.net", "truth", ], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], jni_libs: [ // mockito-target-extended dependencies "libdexmakerjvmtiagent", diff --git a/tests/ProtoInputStreamTests/Android.bp b/tests/ProtoInputStreamTests/Android.bp index 0029080b5a89..40ab257fef37 100644 --- a/tests/ProtoInputStreamTests/Android.bp +++ b/tests/ProtoInputStreamTests/Android.bp @@ -33,7 +33,7 @@ android_test { platform_apis: true, certificate: "platform", test_suites: ["device-tests"], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.system"], static_libs: [ "androidx.test.rules", "frameworks-base-testutils", diff --git a/tests/RemoteDisplayProvider/Android.bp b/tests/RemoteDisplayProvider/Android.bp index 55732d14af46..468bdda75713 100644 --- a/tests/RemoteDisplayProvider/Android.bp +++ b/tests/RemoteDisplayProvider/Android.bp @@ -27,6 +27,6 @@ android_test { sdk_version: "system_current", srcs: ["src/**/*.java"], resource_dirs: ["res"], - libs: ["com.android.media.remotedisplay"], + libs: ["com.android.media.remotedisplay.stubs.system"], certificate: "platform", } diff --git a/tests/ServiceCrashTest/Android.bp b/tests/ServiceCrashTest/Android.bp index fb98b7631b7e..82f397ffe259 100644 --- a/tests/ServiceCrashTest/Android.bp +++ b/tests/ServiceCrashTest/Android.bp @@ -13,7 +13,7 @@ android_test { srcs: ["src/**/*.java"], platform_apis: true, certificate: "platform", - libs: ["android.test.base"], + libs: ["android.test.base.stubs.system"], static_libs: [ "compatibility-device-util-axt", "androidx.test.rules", diff --git a/tests/SharedLibraryLoadingTest/test-apps/SharedLibraryClientTests/Android.bp b/tests/SharedLibraryLoadingTest/test-apps/SharedLibraryClientTests/Android.bp index 0d204979cb92..c0ac50c962f2 100644 --- a/tests/SharedLibraryLoadingTest/test-apps/SharedLibraryClientTests/Android.bp +++ b/tests/SharedLibraryLoadingTest/test-apps/SharedLibraryClientTests/Android.bp @@ -23,7 +23,7 @@ android_test_helper_app { libs: [ "SharedLibraryLoadingTests_StandardSharedLibrary", "SharedLibraryLoadingTests_SharedLibraryLoadedAfter", - "android.test.base", + "android.test.base.stubs.system", ], static_libs: [ "androidx.test.ext.junit", diff --git a/tests/TelephonyCommonTests/Android.bp b/tests/TelephonyCommonTests/Android.bp index b968e5d81148..b1af6aed27a0 100644 --- a/tests/TelephonyCommonTests/Android.bp +++ b/tests/TelephonyCommonTests/Android.bp @@ -50,9 +50,9 @@ android_test { platform_apis: true, libs: [ - "android.test.runner", - "android.test.mock", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", "unsupportedappusage", ], } diff --git a/tests/TrustTests/Android.bp b/tests/TrustTests/Android.bp index 4e75a1d02a41..361c0cd9df97 100644 --- a/tests/TrustTests/Android.bp +++ b/tests/TrustTests/Android.bp @@ -31,8 +31,8 @@ android_test { "truth", ], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], test_suites: [ "device-tests", diff --git a/tests/TtsTests/Android.bp b/tests/TtsTests/Android.bp index b7aa5d4a38aa..e28f69b78141 100644 --- a/tests/TtsTests/Android.bp +++ b/tests/TtsTests/Android.bp @@ -28,8 +28,8 @@ android_test { srcs: ["**/*.java"], static_libs: ["mockito-target"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", ], platform_apis: true, } diff --git a/tests/UpdatableSystemFontTest/Android.bp b/tests/UpdatableSystemFontTest/Android.bp index 12d43383a6e2..34eff4f4579b 100644 --- a/tests/UpdatableSystemFontTest/Android.bp +++ b/tests/UpdatableSystemFontTest/Android.bp @@ -25,7 +25,7 @@ package { android_test { name: "UpdatableSystemFontTest", srcs: ["src/**/*.java"], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs.test"], static_libs: [ "androidx.test.ext.junit", "androidx.test.uiautomator_uiautomator", diff --git a/tests/UsbManagerTests/lib/Android.bp b/tests/UsbManagerTests/lib/Android.bp index 4e5a70fef0ca..506de5c26e3b 100644 --- a/tests/UsbManagerTests/lib/Android.bp +++ b/tests/UsbManagerTests/lib/Android.bp @@ -38,6 +38,6 @@ android_library { "androidx.core_core", ], libs: [ - "android.test.mock", + "android.test.mock.stubs.system", ], } diff --git a/tests/inputmethod/ConcurrentMultiSessionImeTest/Android.bp b/tests/inputmethod/ConcurrentMultiSessionImeTest/Android.bp index a4085e5315a4..44aa4028c916 100644 --- a/tests/inputmethod/ConcurrentMultiSessionImeTest/Android.bp +++ b/tests/inputmethod/ConcurrentMultiSessionImeTest/Android.bp @@ -21,7 +21,7 @@ android_test { name: "ConcurrentMultiSessionImeTest", srcs: ["src/**/*.java"], resource_dirs: ["res"], - libs: ["android.test.runner"], + libs: ["android.test.runner.stubs"], static_libs: [ "androidx.core_core", "androidx.test.ext.junit", diff --git a/tests/permission/Android.bp b/tests/permission/Android.bp index b02f410c733e..d80eaeb32c1e 100644 --- a/tests/permission/Android.bp +++ b/tests/permission/Android.bp @@ -12,8 +12,8 @@ android_test { // Include all test java files. srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs.system", + "android.test.base.stubs.system", "telephony-common", ], static_libs: [ diff --git a/tests/testables/Android.bp b/tests/testables/Android.bp index c0e3d630d1ab..7596ee722d01 100644 --- a/tests/testables/Android.bp +++ b/tests/testables/Android.bp @@ -27,8 +27,8 @@ java_library { name: "testables", srcs: ["src/**/*.java"], libs: [ - "android.test.runner", - "android.test.mock", + "android.test.runner.stubs.system", + "android.test.mock.stubs.system", "androidx.test.rules", "mockito-target-inline-minus-junit4", ], diff --git a/tests/testables/tests/Android.bp b/tests/testables/tests/Android.bp index d6a4754c37aa..1eb36fa5f908 100644 --- a/tests/testables/tests/Android.bp +++ b/tests/testables/tests/Android.bp @@ -45,9 +45,9 @@ android_test { "libmultiplejvmtiagentsinterferenceagent", ], 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", ], certificate: "platform", test_suites: [ diff --git a/tests/utils/testutils/Android.bp b/tests/utils/testutils/Android.bp index deff42a27f47..35fd5b1e6ed0 100644 --- a/tests/utils/testutils/Android.bp +++ b/tests/utils/testutils/Android.bp @@ -35,9 +35,9 @@ java_library { ], 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", "mockito-target-extended-minus-junit4", ], } diff --git a/tests/utils/testutils/tests/Android.bp b/tests/utils/testutils/tests/Android.bp index 8104280cdd5e..3bb02e42ca3b 100644 --- a/tests/utils/testutils/tests/Android.bp +++ b/tests/utils/testutils/tests/Android.bp @@ -35,9 +35,9 @@ android_test { ], 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", ], certificate: "platform", diff --git a/tests/vcn/Android.bp b/tests/vcn/Android.bp index ee2e7cfcd480..b16ba15a6867 100644 --- a/tests/vcn/Android.bp +++ b/tests/vcn/Android.bp @@ -34,8 +34,8 @@ android_test { "flag-junit", ], libs: [ - "android.test.runner", - "android.test.base", - "android.test.mock", + "android.test.runner.stubs", + "android.test.base.stubs", + "android.test.mock.stubs", ], } diff --git a/wifi/tests/Android.bp b/wifi/tests/Android.bp index 1d3e4bd531b4..74a6be9baa56 100644 --- a/wifi/tests/Android.bp +++ b/wifi/tests/Android.bp @@ -44,8 +44,8 @@ android_test { ], libs: [ - "android.test.runner", - "android.test.base", + "android.test.runner.stubs", + "android.test.base.stubs", ], // Required by Extended Mockito |