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

Commit b35091f6 authored May 09, 2022 by Vinh Tran Committed by Automerger Merge Worker May 09, 2022

Merge "Revert "Remove sdk_version if platform_apis is set"" am: aca9b26c am: 31679bad

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084725

Change-Id: I1a63df02d69ae5700d2994829c85ead48973e16d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 391867e5 31679bad

core/tests/PackageInstallerSessions/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,5 +51,6 @@ android_test {
		],

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

core/tests/bugreports/Android.bp

+1 −0

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

core/tests/coretests/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ android_test {
		],

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

		certificate: "platform",

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ package {

		android_test_helper_app {
		name: "PackageManagerServiceDeviceSideTests",
		sdk_version: "test_current",
		srcs: ["src/*/.kt"],
		libs: [
		"android.test.base",