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

Commit de8ce0ae authored Jan 11, 2022 by Treehugger Robot Committed by Automerger Merge Worker Jan 11, 2022

Merge "Update TEST_MAPPING to include CtsMediaEncoderTestCases" am: e846eed9...

Merge "Update TEST_MAPPING to include CtsMediaEncoderTestCases" am: e846eed9 am: 26142b30 am: 94f73714 am: 80d678c0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1941097

Change-Id: I3fc4295d947c875657b3ce70d1c984564a11feaf

parents 76274e14 80d678c0

media/codec2/TEST_MAPPING

+11 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,17 @@
		}
		]
		},
		{
		"name": "CtsMediaEncoderTestCases",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "android.platform.test.annotations.RequiresDevice"
		}
		]
		},
		{
		"name": "CtsMediaPlayerTestCases",
		"options": [

media/libstagefright/TEST_MAPPING

+11 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,17 @@
		}
		]
		},
		{
		"name": "CtsMediaEncoderTestCases",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.Presubmit"
		},
		{
		"exclude-annotation": "android.platform.test.annotations.RequiresDevice"
		}
		]
		},
		{
		"name": "CtsMediaPlayerTestCases",
		"options": [