From 3c4a8625b9e8cdee392bba7cb3feb6efbf0f0a37 Mon Sep 17 00:00:00 2001
From: Derek Jedral <derekjedral@google.com>
Date: Wed, 13 Apr 2022 11:27:37 -0700
Subject: [PATCH] [Trust] Add test target for tablets.

Add a target for tablets that we can point to in order to run tests
during pre and post-submit.

Test: local atest
Bug: 228851008
Change-Id: Ie0a1186cc97388c1b9c282c81e8bfcab5eec814b
---
 core/java/android/app/trust/TEST_MAPPING            | 13 +++++++++++++
 .../core/java/com/android/server/trust/TEST_MAPPING | 13 +++++++++++++
 tests/TrustTests/TEST_MAPPING                       | 13 +++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/core/java/android/app/trust/TEST_MAPPING b/core/java/android/app/trust/TEST_MAPPING
index b9c46bfbba8c8..23923eeb83ee9 100644
--- a/core/java/android/app/trust/TEST_MAPPING
+++ b/core/java/android/app/trust/TEST_MAPPING
@@ -11,5 +11,18 @@
         }
       ]
     }
+  ],
+  "trust-tablet": [
+    {
+      "name": "TrustTests",
+      "options": [
+        {
+          "include-filter": "android.trust.test"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
   ]
 }
\ No newline at end of file
diff --git a/services/core/java/com/android/server/trust/TEST_MAPPING b/services/core/java/com/android/server/trust/TEST_MAPPING
index be8ed67f459b7..fa46acd9c39b1 100644
--- a/services/core/java/com/android/server/trust/TEST_MAPPING
+++ b/services/core/java/com/android/server/trust/TEST_MAPPING
@@ -11,5 +11,18 @@
           }
         ]
       }
+    ],
+    "trust-tablet": [
+      {
+        "name": "TrustTests",
+        "options": [
+          {
+            "include-filter": "android.trust.test"
+          },
+          {
+            "exclude-annotation": "androidx.test.filters.FlakyTest"
+          }
+        ]
+      }
     ]
   }
\ No newline at end of file
diff --git a/tests/TrustTests/TEST_MAPPING b/tests/TrustTests/TEST_MAPPING
index b9c46bfbba8c8..23923eeb83ee9 100644
--- a/tests/TrustTests/TEST_MAPPING
+++ b/tests/TrustTests/TEST_MAPPING
@@ -11,5 +11,18 @@
         }
       ]
     }
+  ],
+  "trust-tablet": [
+    {
+      "name": "TrustTests",
+      "options": [
+        {
+          "include-filter": "android.trust.test"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
   ]
 }
\ No newline at end of file