diff options
author | Vinh Tran <vinhdaitran@google.com> | 2022-05-10 15:29:23 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-05-10 15:29:23 +0000 |
commit | f1a6e001fdf5ec2847b058b9a9e30cd4f44015af (patch) | |
tree | 823c56bfb11a4a42f00a9ffaae15d5025fe97f05 | |
parent | 808b9f1b730ed7d046c26d0c11181632379ce570 (diff) | |
parent | 625cb76f148f39a5b8f4ee523f5ae7679077aa21 (diff) | |
download | base-f1a6e001fdf5ec2847b058b9a9e30cd4f44015af.tar.gz |
Merge "Unset platform_apis if sdk_version is already set"
-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 05ec00fe84f0..f971af1466c3 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 7e4f0e72b62d..2617f4d09ee7 100644 --- 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, } |