Merge "Revert "Remove sdk_version if platform_apis is set""

This commit is contained in:
Vinh Tran
2022-05-09 16:51:02 +00:00
committed by Gerrit Code Review
4 changed files with 4 additions and 0 deletions

View File

@@ -51,5 +51,6 @@ android_test {
], ],
platform_apis: true, platform_apis: true,
sdk_version: "core_platform",
test_suites: ["device-tests"], test_suites: ["device-tests"],
} }

View File

@@ -35,6 +35,7 @@ android_test {
"truth-prebuilt", "truth-prebuilt",
], ],
test_suites: ["general-tests"], test_suites: ["general-tests"],
sdk_version: "test_current",
platform_apis: true, platform_apis: true,
} }

View File

@@ -73,6 +73,7 @@ android_test {
], ],
platform_apis: true, platform_apis: true,
sdk_version: "core_platform",
test_suites: ["device-tests"], test_suites: ["device-tests"],
certificate: "platform", certificate: "platform",

View File

@@ -25,6 +25,7 @@ package {
android_test_helper_app { android_test_helper_app {
name: "PackageManagerServiceDeviceSideTests", name: "PackageManagerServiceDeviceSideTests",
sdk_version: "test_current",
srcs: ["src/**/*.kt"], srcs: ["src/**/*.kt"],
libs: [ libs: [
"android.test.base", "android.test.base",