Merge "Unset platform_apis if sdk_version is already set"

2022-05-10 15:29:23 +00:00
parent 808b9f1b73 625cb76f14
commit f1a6e001fd
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
@@ -38,5 +38,4 @@ android_test_helper_app {
        "androidx.test.rules",
        "truth-prebuilt",
    ],
-    platform_apis: true,
 }