From 27b91a4e08773f64454dd793bf8ff0b7bb3ba4ac Mon Sep 17 00:00:00 2001
From: godofredoc <godofredoc@google.com>
Date: Thu, 4 Jan 2024 13:05:30 -0800
Subject: [PATCH] Use Mac M1s or x86 wherever possible. (flutter/engine#49540)

Arch type was fixed to x86 because release candidate branches didn't have rosetta installed. Rosetta was enabled on December unblocking the use of M1 machines in most of mac ios sub-builds.

Bug: https://github.com/flutter/flutter/issues/133207

[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
---
 .../flutter/ci/builders/mac_ios_engine.json   | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/engine/src/flutter/ci/builders/mac_ios_engine.json b/engine/src/flutter/ci/builders/mac_ios_engine.json
index 08cc3adf97d..9236a19ddcc 100644
--- a/engine/src/flutter/ci/builders/mac_ios_engine.json
+++ b/engine/src/flutter/ci/builders/mac_ios_engine.json
@@ -26,8 +26,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12|Mac-13",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -50,8 +49,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12|Mac-13",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -74,8 +72,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12|Mac-13",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -99,8 +96,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12|Mac-13",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -148,8 +144,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12|Mac-13",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -173,8 +168,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12|Mac-13",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -198,8 +192,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12|Mac-13",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -224,8 +217,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12|Mac-13",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",