From f64e96ef62b920fdfd4d26f7b0d3ac7d5b66edff Mon Sep 17 00:00:00 2001
From: Naomi Musgrave <nmusgrave@google.com>
Date: Wed, 11 Jan 2023 12:34:22 +0000
Subject: Update presubmit mapping for MediaProjection & related

The desired end state:
1) run unit tests when anything in `android.media.projection` changes
2) TODO - tracked by b/265302522 - run CTS tests when anything in `android.media.projection` changes

Tested with "test-mapping" command; runs all presubmit tests in the given directory and parent folders.

Bug: 245745197
Test: atest --test-mapping media/java/android/media/projection:presubmit
Change-Id: Iaffc209af5ae9433455f184ddbacfb41b6f6094d
---
 media/java/android/media/projection/TEST_MAPPING       | 18 ++++++++++++++++++
 media/tests/projection/TEST_MAPPING                    | 13 -------------
 .../com/android/server/media/projection/TEST_MAPPING   | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 media/java/android/media/projection/TEST_MAPPING
 delete mode 100644 media/tests/projection/TEST_MAPPING
 create mode 100644 services/core/java/com/android/server/media/projection/TEST_MAPPING

diff --git a/media/java/android/media/projection/TEST_MAPPING b/media/java/android/media/projection/TEST_MAPPING
new file mode 100644
index 000000000000..a792498b8521
--- /dev/null
+++ b/media/java/android/media/projection/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "MediaProjectionTests",
+      "options": [
+        {
+          "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
+    }
+  ]
+}
diff --git a/media/tests/projection/TEST_MAPPING b/media/tests/projection/TEST_MAPPING
deleted file mode 100644
index ddb68af10734..000000000000
--- a/media/tests/projection/TEST_MAPPING
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "presubmit": [
-        {
-            "name": "FrameworksServicesTests",
-            "options": [
-                {"include-filter": "android.media.projection.mediaprojectiontests"},
-                {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},
-                {"exclude-annotation": "androidx.test.filters.FlakyTest"},
-                {"exclude-annotation": "org.junit.Ignore"}
-            ]
-        }
-    ]
-}
diff --git a/services/core/java/com/android/server/media/projection/TEST_MAPPING b/services/core/java/com/android/server/media/projection/TEST_MAPPING
new file mode 100644
index 000000000000..a792498b8521
--- /dev/null
+++ b/services/core/java/com/android/server/media/projection/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "MediaProjectionTests",
+      "options": [
+        {
+          "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
+    }
+  ]
+}
-- 
cgit v1.2.3-59-g8ed1b