Merge "Remove sdk_version if platform_apis is set"
This commit is contained in:
@@ -51,6 +51,5 @@ android_test {
|
|||||||
],
|
],
|
||||||
|
|
||||||
platform_apis: true,
|
platform_apis: true,
|
||||||
sdk_version: "core_platform",
|
|
||||||
test_suites: ["device-tests"],
|
test_suites: ["device-tests"],
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ android_test {
|
|||||||
"truth-prebuilt",
|
"truth-prebuilt",
|
||||||
],
|
],
|
||||||
test_suites: ["general-tests"],
|
test_suites: ["general-tests"],
|
||||||
sdk_version: "test_current",
|
|
||||||
platform_apis: true,
|
platform_apis: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -73,7 +73,6 @@ android_test {
|
|||||||
],
|
],
|
||||||
|
|
||||||
platform_apis: true,
|
platform_apis: true,
|
||||||
sdk_version: "core_platform",
|
|
||||||
test_suites: ["device-tests"],
|
test_suites: ["device-tests"],
|
||||||
|
|
||||||
certificate: "platform",
|
certificate: "platform",
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ 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",
|
||||||
|
|||||||
Reference in New Issue
Block a user