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

Commit b2818816 authored Apr 08, 2024 by Ronald Braunstein Committed by Automerger Merge Worker Apr 08, 2024

Merge "Migrating test options From TEST_MAPPING -> Android.bp" into main am:...

Merge "Migrating test options From TEST_MAPPING -> Android.bp" into main am: 11514e74 am: 0ae79caa

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

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

parents c32694d5 0ae79caa

cmds/locksettings/TEST_MAPPING

+5 −0

Original line number	Diff line number	Diff line
		@@ -11,5 +11,10 @@
		}
		]
		}
		],
		"postsubmit": [
		{
		"name": "CtsDevicePolicyManagerTestCases_LockSettings_NoFlakes"
		}
		]
		}

services/core/java/com/android/server/locksettings/TEST_MAPPING

+6 −0

Original line number	Diff line number	Diff line
		@@ -24,5 +24,11 @@
		}
		]
		}
		],
		"postsubmit": [
		{
		// TODO(b/332974906): Promote in presubmit-large.
		"name": "CtsDevicePolicyManagerTestCases_LockSettings_NoFlakes"
		}
		]
		}

services/devicepolicy/TEST_MAPPING

+7 −0

Original line number	Diff line number	Diff line
		@@ -26,5 +26,12 @@
		}
		]
		}
		],
		"postsubmit": [
		{
		// TODO(b/332974906): Promote in presubmit presubmit-devicepolicy.
		"name": "CtsDevicePolicyManagerTestCases_NoFlakes_NoLarge",
		"name": "CtsDevicePolicyManagerTestCases_ParentProfileApiDisabled"
		}
		]
		}