Merge "Add relevant unit test to CrashRecovery mts" into main

3 files changed, 19 insertions, 11 deletions

diff --git a/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp b/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp
index 8eae9c7d71fa..e030b3f19e4f 100644
--- a/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp
+++ b/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp
@@ -32,18 +32,18 @@ android_test {
     static_libs: [
         "androidx.test.core",
         "androidx.test.runner",
+        "flag-junit",
         "mockito-target-extended-minus-junit4",
         "services.core",
         "truth",
-        "flag-junit",
     ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
         "true": ["service-crashrecovery-pre-jarjar"],
         default: [],
     }),
 
     libs: [
-        "android.test.mock.stubs.system",
         "android.test.base.stubs.system",
+        "android.test.mock.stubs.system",
         "android.test.runner.stubs.system",
     ],
 
@@ -55,7 +55,9 @@ android_test {
     certificate: "platform",
     platform_apis: true,
     test_suites: [
-        "device-tests",
         "automotive-tests",
+        "device-tests",
+        "mts-crashrecovery",
     ],
+    min_sdk_version: "36",
 }
diff --git a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp
index 5a802d9de2ff..36b064b9b090 100644
--- a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp
+++ b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp
@@ -30,18 +30,18 @@ android_test {
 
     static_libs: [
         "androidx.test.runner",
+        "flag-junit",
         "mockito-target-extended-minus-junit4",
         "services.core",
         "truth",
-        "flag-junit",
     ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), {
         "true": ["service-crashrecovery-pre-jarjar"],
         default: [],
     }),
 
     libs: [
-        "android.test.mock.stubs.system",
         "android.test.base.stubs.system",
+        "android.test.mock.stubs.system",
         "android.test.runner.stubs.system",
     ],
 
@@ -53,9 +53,11 @@ android_test {
     certificate: "platform",
     platform_apis: true,
     test_suites: [
-        "device-tests",
         "automotive-tests",
+        "device-tests",
+        "mts-crashrecovery",
     ],
+    min_sdk_version: "36",
 }
 
 test_module_config {
diff --git a/tests/PackageWatchdog/Android.bp b/tests/PackageWatchdog/Android.bp
index 8be74eaccd20..44e545bac0ce 100644
--- a/tests/PackageWatchdog/Android.bp
+++ b/tests/PackageWatchdog/Android.bp
@@ -26,12 +26,12 @@ android_test {
     name: "PackageWatchdogTest",
     srcs: ["src/**/*.java"],
     static_libs: [
-        "junit",
-        "mockito-target-extended-minus-junit4",
+        "PlatformProperties",
+        "androidx.test.rules",
         "flag-junit",
         "frameworks-base-testutils",
-        "androidx.test.rules",
-        "PlatformProperties",
+        "junit",
+        "mockito-target-extended-minus-junit4",
         "services.core",
         "services.net",
         "truth",
@@ -49,5 +49,9 @@ android_test {
         "libstaticjvmtiagent",
     ],
     platform_apis: true,
-    test_suites: ["device-tests"],
+    test_suites: [
+        "device-tests",
+        "mts-crashrecovery",
+    ],
+    min_sdk_version: "36",
 }