Merge "Unset platform_apis if sdk_version is already set" am: f1a6e001fd am: f4f0c7d545
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2085943 Change-Id: I42cca3e815e6eca47ff8b5a5090963c34fb70635 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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"],
|
||||||
|
|
||||||
|
|||||||
@@ -40,5 +40,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