summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Marcus <ramarcus@google.com> 2023-07-25 15:15:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-25 15:15:54 +0000
commitdd5a9ee5cf152c93c49c53f9ee387a82c6e67fc8 (patch)
treef707e364bad1f16f64548a54362d91f13ffd3c43
parentf415dd3e279758da0b6fce796694873228c66c51 (diff)
parentd1f7c234a0e16964f7c6b7a4e6126c6970e9fe1c (diff)
Merge "Update tplus to have min_sdk_version 33" into udc-mainline-prod am: d1f7c234a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24154768 Change-Id: If52e51795a1296b0c3d1293b6bb37c611018c117 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--TEST_MAPPING20
1 files changed, 18 insertions, 2 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 1b5795fb2798..122e627b7067 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -74,7 +74,15 @@
]
},
{
- "name": "ExtServicesUnitTests",
+ "name": "ExtServicesUnitTests-tplus",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ },
+ {
+ "name": "ExtServicesUnitTests-sminus",
"options": [
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
@@ -142,7 +150,15 @@
]
},
{
- "name": "ExtServicesUnitTests",
+ "name": "ExtServicesUnitTests-tplus",
+ "options": [
+ {
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
+ },
+ {
+ "name": "ExtServicesUnitTests-sminus",
"options": [
{
"exclude-annotation": "androidx.test.filters.FlakyTest"