From d5ba7db74c8df33cd95dd9d7c8080c261dfa5a44 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. (#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
---
 ci/builders/mac_ios_engine.json | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json
index cb18b23ed0e3f..4793e3ce13ff1 100644
--- a/ci/builders/mac_ios_engine.json
+++ b/ci/builders/mac_ios_engine.json
@@ -28,8 +28,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -54,8 +53,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -80,8 +78,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -107,8 +104,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -134,7 +130,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
+                "os=Mac-12|Mac-13",
                 "cpu=x86"
             ],
             "gn": [
@@ -160,8 +156,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -187,8 +182,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -214,8 +208,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",
@@ -242,8 +235,7 @@
         {
             "drone_dimensions": [
                 "device_type=none",
-                "os=Mac-12",
-                "cpu=x86"
+                "os=Mac-12|Mac-13"
             ],
             "gn": [
                 "--ios",