diff options
| author | 2022-05-10 21:41:30 +0000 | |
|---|---|---|
| committer | 2022-05-10 21:41:30 +0000 | |
| commit | 3f1589bdd776afe81a39581ccb6e91ca3cb0ae9d (patch) | |
| tree | e55074258e77ce3a5714a5f859419cffbf609df4 | |
| parent | 40ecb25f54163509702e4f4e85bb167266d9bad5 (diff) | |
| parent | 6ac637dcda05ac86129f567c23aa9564bd89f6a8 (diff) | |
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>
| -rw-r--r-- | core/tests/PackageInstallerSessions/Android.bp | 1 | ||||
| -rw-r--r-- | core/tests/bugreports/Android.bp | 1 | ||||
| -rw-r--r-- | core/tests/coretests/Android.bp | 1 | ||||
| -rw-r--r-- | services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/core/tests/PackageInstallerSessions/Android.bp b/core/tests/PackageInstallerSessions/Android.bp index c112cbb47b55..6f2366e32574 100644 --- 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"], } diff --git a/core/tests/bugreports/Android.bp b/core/tests/bugreports/Android.bp index f87797a90c90..2b34ee2646f3 100644 --- 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 { diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp index c1f3c4fc12c7..48c9df04a662 100644 --- 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"], diff --git a/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp b/services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp index 53adc2fb00e6..462c5801e952 100644 --- 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, } |