Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ac637dc authored May 10, 2022 by Vinh Tran Committed by Automerger Merge Worker May 10, 2022

Merge "Unset platform_apis if sdk_version is already set" am: f1a6e001 am: f4f0c7d5

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>

parents 3361c7cd f4f0c7d5

core/tests/PackageInstallerSessions/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ android_test {
		":PackageManagerTestAppVersion1",
		],

		platform_apis: true,
		sdk_version: "core_platform",
		test_suites: ["device-tests"],
		}

core/tests/bugreports/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ android_test {
		],
		test_suites: ["general-tests"],
		sdk_version: "test_current",
		platform_apis: true,
		}

		filegroup {

core/tests/coretests/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,6 @@ android_test {
		"libpowermanagertest_jni",
		],

		platform_apis: true,
		sdk_version: "core_platform",
		test_suites: ["device-tests"],

services/tests/PackageManagerServiceTests/host/test-apps/DeviceSide/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,5 +40,4 @@ android_test_helper_app {
		"androidx.test.rules",
		"truth-prebuilt",
		],
		platform_apis: true,
		}