Reverts "Remove legacy platforms in .ci.yaml with 0 usages. (flutter#169783)" (flutter#169799)

auto-submit[bot] · auto-submit[bot] · web-flow · commit 99f74987aa46 · 2025-05-30T23:35:47.000Z
Reverts: flutter#169783   Initiated by: gaaclarke   Reason for reverting: breaks `Linux ci_yaml flutter roller` https://ci.chromium.org/ui/p/flutter/builders/prod/Linux%20ci_yaml%20flutter%20roller/19333/overview   Original PR Author: matanlurey   Reviewed By: {zanderso}   This change reverts the following previous change: No description provided.  Co-authored-by: auto-submit[bot] <flutter-engprod-team@google.com>
diff --git a/.ci.yaml b/.ci.yaml
@@ -26,7 +26,6 @@ platform_properties:
       cores: "8"
       device_type: none
       ignore_flakiness: "true"
-
   linux:
     properties:
       dependencies: >-
@@ -36,7 +35,6 @@ platform_properties:
       os: Ubuntu
       cores: "8"
       device_type: none
-
   # The current android emulator config names can be found here:
   # https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/android/avd/proto
   # You may use those names for the android_virtual_device version. You may find the
@@ -60,7 +58,6 @@ platform_properties:
       cores: "8"
       device_type: none
       kvm: "1"
-
   # linux_android_emu_unstable is intended to be how flutter-android proves the stability
   # of new combinations of dependencies.
   linux_android_emu_unstable:
@@ -80,7 +77,6 @@ platform_properties:
       cores: "8"
       device_type: none
       kvm: "1"
-
   linux_build_test:
     properties:
       dependencies: >-
@@ -92,6 +88,16 @@ platform_properties:
       os: Ubuntu
       cores: "8"
       device_type: none
+  linux_android:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:36v1"},
+          {"dependency": "open_jdk", "version": "version:21"},
+          {"dependency": "curl", "version": "version:7.64.0"}
+        ]
+      os: Linux
+      device_type: "msm8952"
 
   linux_pixel_7pro:
     properties:
@@ -142,7 +148,6 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
-
   mac_arm64:
     properties:
       contexts: >-
@@ -160,7 +165,6 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
-
   mac_benchmark:
     properties:
       contexts: >-
@@ -180,7 +184,6 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
-
   mac_x64:
     properties:
       contexts: >-
@@ -198,7 +201,6 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
-
   mac_build_test:
     properties:
       contexts: >-
@@ -217,6 +219,27 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
+  mac_android:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:36v1"},
+          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
+          {"dependency": "open_jdk", "version": "version:21"}
+        ]
+      os: Mac-14|Mac-15.5
+      cpu: x86
+      device_type: "msm8952"
+  mac_arm64_android:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:36v1"},
+          {"dependency": "open_jdk", "version": "version:21"}
+        ]
+      os: Mac-14|Mac-15.5
+      cpu: arm64
+      device_type: "msm8952"
 
   mac_mokey:
     properties:
@@ -229,7 +252,6 @@ platform_properties:
       os: Mac-14|Mac-15.5
       cpu: x86
       device_type: "mokey"
-
   mac_arm64_mokey:
     properties:
       dependencies: >-
@@ -241,6 +263,16 @@ platform_properties:
       cpu: arm64
       device_type: "mokey"
 
+  mac_pixel_7pro:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:36v1"},
+          {"dependency": "open_jdk", "version": "version:21"}
+        ]
+      os: Mac-14|Mac-15.5
+      cpu: x86
+      device_type: "Pixel 7 Pro"
   mac_ios:
     properties:
       contexts: >-
@@ -258,7 +290,6 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
-
   mac_x64_ios:
     properties:
       contexts: >-
@@ -277,7 +308,6 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
-
   mac_arm64_ios:
     properties:
       contexts: >-
@@ -296,18 +326,26 @@ platform_properties:
         {
           "sdk_version": "16c5032a"
         }
-
   windows:
     properties:
       os: Windows-10
       device_type: none
-
   windows_arm64:
     properties:
+      # The arch can be removed after https://github.com/flutter/flutter/issues/135722.
       arch: arm
       os: Windows
       cpu: arm64
-
+  windows_android:
+    properties:
+      dependencies: >-
+        [
+          {"dependency": "android_sdk", "version": "version:36v1"},
+          {"dependency": "chrome_and_driver", "version": "version:125.0.6422.141"},
+          {"dependency": "open_jdk", "version": "version:21"}
+        ]
+      os: Windows-10
+      device_type: "msm8952"
   windows_mokey:
     properties:
       dependencies: >-
