Merge "Unset platform_apis if sdk_version is already set" am: f1a6e001fd am: f4f0c7d545 am: 6ac637dcda

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2085943 Change-Id: I7581b06bfadc863fab5141a5634fdc9dea27f55f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:41:30 +00:00
parent 40ecb25f54 6ac637dcda
commit 3f1589bdd7
4 changed files with 0 additions and 4 deletions
--- a/core/tests/PackageInstallerSessions/Android.bp
+++ b/core/tests/PackageInstallerSessions/Android.bp
@@ -50,7 +50,6 @@ android_test {
        ":PackageManagerTestAppVersion1",
    ],

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

 filegroup {
--- a/core/tests/coretests/Android.bp
+++ b/core/tests/coretests/Android.bp
@@ -72,7 +72,6 @@ android_test {
        "libpowermanagertest_jni",
    ],

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

--- a/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
+++ b/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp
@@ -40,5 +40,4 @@ android_test_helper_app {
        "androidx.test.rules",
        "truth-prebuilt",
    ],
-    platform_apis: true,
 }