Merge "Remove sdk_version if platform_apis is set" am: ac9b99119c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2065675 Change-Id: If7fb6f7697c84375edd897dd94e85cd3037a4242 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 14:24:02 +00:00
parent 1b11ca259f ac9b99119c
commit 3e589c33ee
4 changed files with 0 additions and 4 deletions
--- a/core/tests/PackageInstallerSessions/Android.bp
+++ b/core/tests/PackageInstallerSessions/Android.bp
@@ -51,6 +51,5 @@ 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,7 +35,6 @@ 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,7 +73,6 @@ 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,7 +25,6 @@ package {

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