Merge 24Q4 (ab/12406339) into aosp-main-future

Bug: 370570306 Merged-In: Ie90e7495dd4a134538bae6e3e08eea0d02134b14 Change-Id: I20517e9ee410e95f2cbeb1247c0c0288ed9f006f
2024-11-11 21:38:40 -08:00
parent c4d90bf739 658459de9b
commit cfa19e11a6
1597 changed files with 77072 additions and 46403 deletions
--- a/tests/Enable16KbTests/Android.bp
+++ b/tests/Enable16KbTests/Android.bp
@@ -33,7 +33,6 @@ android_test {
    ],
    platform_apis: true,
    certificate: "platform",
-    test_suites: ["device-tests"],
    libs: [
        "android.test.runner.stubs.system",
        "android.test.base.stubs.system",
@@ -57,6 +56,6 @@ java_test_host {
    device_common_data: [
        ":test_16kb_app",
    ],
-    test_suites: ["device-tests"],
+    test_suites: ["general-tests"],
    test_config: "AndroidTest.xml",
 }