commit bae0a3c1b098f8bb84d1c204bcd4212e09c3c937
author Robert Shih <robertshih@google.com> Mon Mar 13 17:34:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 13 17:34:48 2023 +0000
tree 60f0ecaccc04728dd8a0e0fa83865d8ef08c5855
parent 858084554f8a4d5213968d20d1ff0dba8a55b67c
parent 94424d4cf7c6fa5477ebbe5e893457aa6cc14840

Merge "TEST_MAPPING: only run CtsMediaDrmFrameworkTestCases on drm changes" am: 027d3539a5 am: 94424d4cf7

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

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

media/TEST_MAPPING

diff --git a/media/TEST_MAPPING b/media/TEST_MAPPING
index a22ec19..9aa896c 100644
--- a/media/TEST_MAPPING
+++ b/media/TEST_MAPPING
@@ -34,12 +34,15 @@
                 }
             ],
             "file_patterns": ["(?i)drm|crypto"]
-        }
-    ],
-
-    "imports": [
+        },
         {
-            "path": "frameworks/av/drm/mediadrm/plugins"
+            "name": "CtsMediaDrmFrameworkTestCases",
+            "options" : [
+                {
+                    "include-annotation": "android.platform.test.annotations.Presubmit"
+                }
+            ],
+            "file_patterns": ["(?i)drm|crypto"]
         }
     ],