Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Bug: 337098550 Merged-In: I102674aa519cf562aa8d0b852ebb8067748894a6 Change-Id: I7d4c5e5a30eb6b63834adfaee83d44c8836c66f4
2024-05-06 12:09:30 -07:00
parent addf459dda a3e17333ad
commit 66fe5627e6
31 changed files with 63 additions and 63 deletions
@@ -30,7 +30,10 @@ android_test {
    sdk_version: "current",
    test_suites: ["general-tests"],
    certificate: "platform",
-    static_libs: ["mockito-target"],
+    static_libs: [
+        "mockito-target",
+        "androidx.test.rules",
+    ],
    libs: [
        "android.test.mock.stubs",
        "android.test.runner.stubs",