From e7fdcf15bac9300dd223689252028258d167a652 Mon Sep 17 00:00:00 2001
From: Godofredo Contreras <godofredoc@google.com>
Date: Wed, 24 Aug 2022 09:36:46 -0700
Subject: [PATCH 1/2] Generate mac os framework with a global generator.

Previously we were generating mac os framework in the host_debug
subbuild but that was only updating the x64 architecture but the
expection is to include x64 and arm64. As those builds are generated
separately we need to create the FAT binaries in the orchestrator rather
than the subbuilds.
---
 ci/builders/mac_host_engine.json | 39 +++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index 9f9c368f48d3f..c3b6454b89af4 100644
--- a/ci/builders/mac_host_engine.json
+++ b/ci/builders/mac_host_engine.json
@@ -6,7 +6,6 @@
                     "base_path": "out/host_debug/zip_archives/",
                     "type": "gcs",
                     "include_paths": [
-                        "out/host_debug/zip_archives/darwin-x64/FlutterMacOS.framework.zip",
                         "out/host_debug/zip_archives/darwin-x64/gen_snapshot.zip",
                         "out/host_debug/zip_archives/darwin-x64/artifacts.zip",
                         "out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip",
@@ -52,7 +51,6 @@
                     "base_path": "out/host_profile/zip_archives/",
                     "type": "gcs",
                     "include_paths": [
-                        "out/host_profile/zip_archives/darwin-x64-profile/FlutterMacOS.framework.zip",
                         "out/host_profile/zip_archives/darwin-x64-profile/gen_snapshot.zip",
                         "out/host_profile/zip_archives/darwin-x64-profile/artifacts.zip"
                     ],
@@ -106,7 +104,6 @@
                     "base_path": "out/host_release/zip_archives/",
                     "type": "gcs",
                     "include_paths": [
-                        "out/host_release/zip_archives/darwin-x64-release/FlutterMacOS.framework.zip",
                         "out/host_release/zip_archives/darwin-x64-release/gen_snapshot.zip",
                         "out/host_release/zip_archives/darwin-x64-release/artifacts.zip",
                         "out/host_release/zip_archives/darwin-x64/font-subset.zip"
@@ -275,6 +272,30 @@
                     "--strip"
                 ],
                 "script": "flutter/sky/tools/create_macos_framework.py"
+            },
+            {
+                "name": "Debug-FlutterMacOS.framework",
+                "parameters": [
+                    "--dst",
+                    "out/debug",
+                    "--arm64-out-dir",
+                    "out/mac_debug_arm64",
+                    "--x64-out-dir",
+                    "out/host_debug"
+                ],
+                "script": "flutter/sky/tools/create_macos_framework.py"
+            },
+            {
+                "name": "Profile-FlutterMacOS.framework",
+                "parameters": [
+                    "--dst",
+                    "out/profile",
+                    "--arm64-out-dir",
+                    "out/mac_profile_arm64",
+                    "--x64-out-dir",
+                    "out/host_profile"
+                ],
+                "script": "flutter/sky/tools/create_macos_framework.py"
             }
         ]
     },
@@ -282,6 +303,18 @@
         {
             "source": "out/release/FlutterMacOS.dSYM.zip",
             "destination": "darwin-x64-release/FlutterMacOS.dSYM.zip"
+        },
+        {
+            "source": "out/debug/FlutterMacOS.framework.zip",
+            "destination": "darwin-x64/FlutterMacOS.framework.zip"
+        },
+        {
+            "source": "out/profile/FlutterMacOS.framework.zip",
+            "destination": "darwin-x64-profile/FlutterMacOS.framework.zip"
+        },
+        {
+            "source": "out/release/FlutterMacOS.framework.zip",
+            "destination": "darwin-x64-release/FlutterMacOS.framework.zip"
         }
     ]
 }

From f1be1f57eeede9775de1336379504fc2a2481940 Mon Sep 17 00:00:00 2001
From: Godofredo Contreras <godofredoc@google.com>
Date: Mon, 29 Aug 2022 19:26:31 -0700
Subject: [PATCH 2/2] Add --zip option to package the artifacts.

---
 ci/builders/mac_host_engine.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index c3b6454b89af4..37cb8a8b9d724 100644
--- a/ci/builders/mac_host_engine.json
+++ b/ci/builders/mac_host_engine.json
@@ -269,7 +269,8 @@
                     "--x64-out-dir",
                     "out/host_release",
                     "--dsym",
-                    "--strip"
+                    "--strip",
+                    "--zip"
                 ],
                 "script": "flutter/sky/tools/create_macos_framework.py"
             },
@@ -281,7 +282,8 @@
                     "--arm64-out-dir",
                     "out/mac_debug_arm64",
                     "--x64-out-dir",
-                    "out/host_debug"
+                    "out/host_debug",
+                    "--zip"
                 ],
                 "script": "flutter/sky/tools/create_macos_framework.py"
             },
@@ -293,7 +295,8 @@
                     "--arm64-out-dir",
                     "out/mac_profile_arm64",
                     "--x64-out-dir",
-                    "out/host_profile"
+                    "out/host_profile",
+                    "--zip"
                 ],
                 "script": "flutter/sky/tools/create_macos_framework.py"
             }