Merge "Revert "Remove sdk_version if platform_apis is set""

2022-05-09 16:51:02 +00:00
parent c8f3e70f59 cfb43cae24
commit aca9b26c93
4 changed files with 4 additions and 0 deletions
--- a/core/tests/PackageInstallerSessions/Android.bp
+++ b/core/tests/PackageInstallerSessions/Android.bp
@@ -51,5 +51,6 @@ android_test {
    ],

    platform_apis: true,
+    sdk_version: "core_platform",
    test_suites: ["device-tests"],
 }
--- a/core/tests/bugreports/Android.bp
+++ b/core/tests/bugreports/Android.bp
@@ -35,6 +35,7 @@ android_test {
        "truth-prebuilt",
    ],
    test_suites: ["general-tests"],
+    sdk_version: "test_current",
    platform_apis: true,
 }

--- a/core/tests/coretests/Android.bp
+++ b/core/tests/coretests/Android.bp
@@ -73,6 +73,7 @@ android_test {
    ],

    platform_apis: true,
+    sdk_version: "core_platform",
    test_suites: ["device-tests"],

    certificate: "platform",
--- a/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
+++ b/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
@@ -25,6 +25,7 @@ package {

 android_test_helper_app {
    name: "PackageManagerServiceDeviceSideTests",
+    sdk_version: "test_current",
    srcs: ["src/**/*.kt"],
    libs: [
        "android.test.base",