commit d4ec9d986a7d576827ba27706a21ccb276b56315
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 14 21:57:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 14 21:57:01 2022 +0000
tree 956886d918ba987f061428b9409fd2a0e01f85d0
parent 89eb2a8bf898f93d7870aa78c5602a3a21f21e17
parent 4a7253fee39428f6d2b677908d2e57a36f69c261

Merge "Update TEST_MAPPING to include CtsMediaDecoderTestCases" am: cdea444df7 am: 263274d4ab am: 4a7253fee3

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

Change-Id: Icf7d0378848186872e2f84ecda873e135a521819

media/codec2/TEST_MAPPING

diff --git a/media/codec2/TEST_MAPPING b/media/codec2/TEST_MAPPING
index 2b96055..f23684a 100644
--- a/media/codec2/TEST_MAPPING
+++ b/media/codec2/TEST_MAPPING
@@ -37,6 +37,17 @@
       ]
     },
     {
+      "name": "CtsMediaDecoderTestCases",
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "android.platform.test.annotations.RequiresDevice"
+        }
+      ]
+    },
+    {
       "name": "CtsMediaEncoderTestCases",
       "options": [
         {

media/libstagefright/TEST_MAPPING

diff --git a/media/libstagefright/TEST_MAPPING b/media/libstagefright/TEST_MAPPING
index 53181cc..807b525 100644
--- a/media/libstagefright/TEST_MAPPING
+++ b/media/libstagefright/TEST_MAPPING
@@ -42,6 +42,17 @@
       ]
     },
     {
+      "name": "CtsMediaDecoderTestCases",
+      "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "android.platform.test.annotations.RequiresDevice"
+        }
+      ]
+    },
+    {
       "name": "CtsMediaEncoderTestCases",
       "options": [
         {