From 52e82d986eb3ac14d3098f167faf229c5e6e7710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= <tweek@google.com>
Date: Tue, 14 Mar 2023 23:04:07 +0000
Subject: [PATCH] Add presubmit TEST_MAPPING

Move to the 'device-tests' test suites to ensure the correct platform
certificate is used (see b/272181400).

Bug: 269721152
Bug: 272181400
Test: atest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1f635608637d76ad750e0a0675cb557c9fef3131)
Merged-In: Ibd84045b26efe2b46a33da9c220834e0f7c33fd8

Change-Id: I840d79e1132162b64f233979200309d53a39d36b
---
 tests/EnforcePermission/TEST_MAPPING        | 7 +++++++
 tests/EnforcePermission/test-app/Android.bp | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 tests/EnforcePermission/TEST_MAPPING

diff --git a/tests/EnforcePermission/TEST_MAPPING b/tests/EnforcePermission/TEST_MAPPING
new file mode 100644
index 0000000000000..a1bf42a44e86d
--- /dev/null
+++ b/tests/EnforcePermission/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "EnforcePermissionTests"
+    }
+  ]
+}
diff --git a/tests/EnforcePermission/test-app/Android.bp b/tests/EnforcePermission/test-app/Android.bp
index 305ed8f0dadc3..cd53854189b7b 100644
--- a/tests/EnforcePermission/test-app/Android.bp
+++ b/tests/EnforcePermission/test-app/Android.bp
@@ -34,5 +34,5 @@ android_test {
     ],
     platform_apis: true,
     certificate: "platform",
-    test_suites: ["general-tests"],
+    test_suites: ["device-tests"],
 }