From 8e9b550fbd376e55b83bdf22db09e52d484a1162 Mon Sep 17 00:00:00 2001
From: Xilai Zhang <xilaizhang@google.com>
Date: Wed, 26 Apr 2023 11:18:51 -0700
Subject: [PATCH 1/2] add pinned xcode versions

---
 ci/builders/mac_android_aot_engine.json | 30 +++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json
index 6bb034cc6744d..f3a235ecf66c5 100644
--- a/ci/builders/mac_android_aot_engine.json
+++ b/ci/builders/mac_android_aot_engine.json
@@ -32,6 +32,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14c18"
+                }
+            },
             "tests": []
         },
         {
@@ -67,6 +72,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14c18"
+                }
+            },
             "tests": []
         },
         {
@@ -102,6 +112,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14c18"
+                }
+            },
             "tests": []
         },
         {
@@ -136,6 +151,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14c18"
+                }
+            },
             "tests": []
         },
         {
@@ -171,6 +191,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14c18"
+                }
+            },
             "tests": []
         },
         {
@@ -206,6 +231,11 @@
                     "flutter/shell/platform/android:gen_snapshot"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14c18"
+                }
+            },
             "tests": []
         }
     ],

From 2c167f4e7394231892132b18739959d077ed6c56 Mon Sep 17 00:00:00 2001
From: Xilai Zhang <xilaizhang@google.com>
Date: Wed, 26 Apr 2023 14:42:56 -0700
Subject: [PATCH 2/2] remove empty tests

---
 ci/builders/mac_android_aot_engine.json | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json
index 33218e194760c..33819638de5cf 100644
--- a/ci/builders/mac_android_aot_engine.json
+++ b/ci/builders/mac_android_aot_engine.json
@@ -37,8 +37,7 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "14c18"
                 }
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -78,8 +77,7 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "14c18"
                 }
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -119,8 +117,7 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "14c18"
                 }
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -159,8 +156,7 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "14c18"
                 }
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -200,8 +196,7 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "14c18"
                 }
-            },
-            "tests": []
+            }
         },
         {
             "archives": [
@@ -241,8 +236,7 @@
                 "$flutter/osx_sdk": {
                     "sdk_version": "14c18"
                 }
-            },
-            "tests": []
+            }
         }
     ],
     "generators": [],