diff options
| author | 2024-08-20 21:42:18 +0000 | |
|---|---|---|
| committer | 2024-08-20 21:42:18 +0000 | |
| commit | 0925c9d188c377f999376d11b57a77ea1e0be239 (patch) | |
| tree | 78f9b5e3ea9bc05fe34e3f1f2305116d1a55d337 /apex | |
| parent | 196086c8583e4fd75eea1254205ae3a8feff82ff (diff) | |
| parent | 965a21222b604571b6f37e2318202709da37fc83 (diff) | |
Merge "Migrate FrameworksServicesTests options to Android.bp" into main am: e7f900f0db am: 965a21222b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3225805
Change-Id: If44686549a13cf003d347b0f1b0f66d566071fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING | 7 | ||||
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING | 6 |
2 files changed, 2 insertions, 11 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING index e82df1203137..36b6c80eebe3 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING +++ b/apex/jobscheduler/service/java/com/android/server/job/TEST_MAPPING @@ -16,12 +16,7 @@ ] }, { - "name": "FrameworksServicesTests", - "options": [ - {"include-filter": "com.android.server.job"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"}, - {"exclude-annotation": "androidx.test.filters.LargeTest"} - ] + "name": "FrameworksServicesTests_com_android_server_job_Presubmit" } ], "postsubmit": [ diff --git a/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING b/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING index a75415ec6151..52670a2570d3 100644 --- a/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING +++ b/apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING @@ -17,11 +17,7 @@ ] }, { - "name": "FrameworksServicesTests", - "options": [ - {"include-filter": "com.android.server.usage"}, - {"exclude-annotation": "androidx.test.filters.FlakyTest"} - ] + "name": "FrameworksServicesTests_com_android_server_usage_Presubmit" } ], "postsubmit": [ |