Merge "Unset platform_apis if sdk_version is already set"
This commit is contained in:
@@ -50,7 +50,6 @@ android_test {
|
|||||||
":PackageManagerTestAppVersion1",
|
":PackageManagerTestAppVersion1",
|
||||||
],
|
],
|
||||||
|
|
||||||
platform_apis: true,
|
|
||||||
sdk_version: "core_platform",
|
sdk_version: "core_platform",
|
||||||
test_suites: ["device-tests"],
|
test_suites: ["device-tests"],
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ android_test {
|
|||||||
],
|
],
|
||||||
test_suites: ["general-tests"],
|
test_suites: ["general-tests"],
|
||||||
sdk_version: "test_current",
|
sdk_version: "test_current",
|
||||||
platform_apis: true,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
filegroup {
|
filegroup {
|
||||||
|
|||||||
@@ -72,7 +72,6 @@ android_test {
|
|||||||
"libpowermanagertest_jni",
|
"libpowermanagertest_jni",
|
||||||
],
|
],
|
||||||
|
|
||||||
platform_apis: true,
|
|
||||||
sdk_version: "core_platform",
|
sdk_version: "core_platform",
|
||||||
test_suites: ["device-tests"],
|
test_suites: ["device-tests"],
|
||||||
|
|
||||||
|
|||||||
@@ -38,5 +38,4 @@ android_test_helper_app {
|
|||||||
"androidx.test.rules",
|
"androidx.test.rules",
|
||||||
"truth-prebuilt",
|
"truth-prebuilt",
|
||||||
],
|
],
|
||||||
platform_apis: true,
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user