From c1a42549e786cc0d8b767f33d11815d235326124 Mon Sep 17 00:00:00 2001
From: Zach Anderson <zra@google.com>
Date: Wed, 21 Aug 2024 09:54:30 -0700
Subject: [PATCH] Split tests out of Linux Android artifact creation builds

---
 ci/builders/linux_android_debug_engine.json | 42 +--------
 ci/builders/linux_unopt.json                | 94 +++++++++++++++++++++
 2 files changed, 98 insertions(+), 38 deletions(-)

diff --git a/ci/builders/linux_android_debug_engine.json b/ci/builders/linux_android_debug_engine.json
index f9568bc709a4c..a9f2c20f70a21 100644
--- a/ci/builders/linux_android_debug_engine.json
+++ b/ci/builders/linux_android_debug_engine.json
@@ -36,26 +36,9 @@
                 "targets": [
                     "flutter",
                     "flutter/shell/platform/android:embedding_jars",
-                    "flutter/shell/platform/android:abi_jars",
-                    "flutter/shell/platform/android:robolectric_tests"
+                    "flutter/shell/platform/android:abi_jars"
                 ]
-            },
-            "tests": [
-                {
-                    "language": "python3",
-                    "name": "Host Tests for android_jit_release_x86",
-                    "script": "flutter/testing/run_tests.py",
-                    "parameters": [
-                        "--variant",
-                        "ci/android_jit_release_x86",
-                        "--type",
-                        "java",
-                        "--engine-capture-core-dump",
-                        "--android-variant",
-                        "ci/android_jit_release_x86"
-                    ]
-                }
-            ]
+            }
         },
         {
             "archives": [
@@ -99,26 +82,9 @@
                     "flutter/sky/dist:zip_old_location",
                     "flutter/lib/gpu/dist:zip_old_location",
                     "flutter/shell/platform/android:embedding_jars",
-                    "flutter/shell/platform/android:abi_jars",
-                    "flutter/shell/platform/android:robolectric_tests"
+                    "flutter/shell/platform/android:abi_jars"
                 ]
-            },
-            "tests": [
-                {
-                    "language": "python3",
-                    "name": "Host Tests for android_debug",
-                    "script": "flutter/testing/run_tests.py",
-                    "parameters": [
-                        "--variant",
-                        "ci/android_debug",
-                        "--type",
-                        "java",
-                        "--engine-capture-core-dump",
-                        "--android-variant",
-                        "ci/android_debug"
-                    ]
-                }
-            ]
+            }
         },
         {
             "archives": [
diff --git a/ci/builders/linux_unopt.json b/ci/builders/linux_unopt.json
index 855468ab5c8f5..fe260c013b49a 100644
--- a/ci/builders/linux_unopt.json
+++ b/ci/builders/linux_unopt.json
@@ -269,6 +269,100 @@
                     ]
                 }
             ]
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--target-dir",
+                "ci/android_jit_release_x86_test",
+                "--android",
+                "--android-cpu=x86",
+                "--runtime-mode=jit_release",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "ci/android_jit_release_x86_test",
+            "description": "Produces jit-release mode artifacts to target x86 Android from a Linux host.",
+            "ninja": {
+                "config": "ci/android_jit_release_x86_test",
+                "targets": [
+                    "flutter",
+                    "flutter/shell/platform/android:embedding_jars",
+                    "flutter/shell/platform/android:abi_jars",
+                    "flutter/shell/platform/android:robolectric_tests"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for android_jit_release_x86_test",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "ci/android_jit_release_x86_test",
+                        "--type",
+                        "java",
+                        "--engine-capture-core-dump",
+                        "--android-variant",
+                        "ci/android_jit_release_x86_test"
+                    ]
+                }
+            ]
+        },
+        {
+            "cas_archive": false,
+            "drone_dimensions": [
+                "device_type=none",
+                "os=Linux"
+            ],
+            "gclient_variables": {
+                "use_rbe": true
+            },
+            "gn": [
+                "--target-dir",
+                "ci/android_debug_test",
+                "--android",
+                "--android-cpu=arm",
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
+            ],
+            "name": "ci/android_debug_test",
+            "description": "Produces debug mode artifacts to target 32-bit arm Android from a Linux host.",
+            "ninja": {
+                "config": "ci/android_debug_test",
+                "targets": [
+                    "flutter",
+                    "flutter/sky/dist:zip_old_location",
+                    "flutter/lib/gpu/dist:zip_old_location",
+                    "flutter/shell/platform/android:embedding_jars",
+                    "flutter/shell/platform/android:abi_jars",
+                    "flutter/shell/platform/android:robolectric_tests"
+                ]
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Host Tests for android_debug_test",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "ci/android_debug_test",
+                        "--type",
+                        "java",
+                        "--engine-capture-core-dump",
+                        "--android-variant",
+                        "ci/android_debug_test"
+                    ]
+                }
+            ]
         }
     ]
 }