From ad4136d438cf26d58a220a6589b80fef79fc87ed Mon Sep 17 00:00:00 2001
From: godofredoc <godofredoc@google.com>
Date: Wed, 26 Apr 2023 18:41:48 -0700
Subject: [PATCH] reland "Migrate mac_host_engine to engine v2 builds."
 (flutter/engine#41531)

Relands: https://github.com/flutter/engine/pull/41149

GN+Ninja artifacts have been validated manually. The number of files and their content is the same and presubmit tests are passing correctly in the engine and flutter.

The reason of previous reverts are:

* FlutterMacOS.framework.zip required to be double zipped.
* FlutterMacOS.dSYM.zip required to be double zipped.
* GCS cache header needed to be updated during testing.

Full details of what has been fixed can be found in: https://github.com/flutter/flutter/issues/124911
---
 engine/src/flutter/.ci.yaml                   |  1 +
 .../flutter/ci/builders/mac_host_engine.json  | 39 ++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/engine/src/flutter/.ci.yaml b/engine/src/flutter/.ci.yaml
index 2765cf990b2..a6cf639a8a9 100644
--- a/engine/src/flutter/.ci.yaml
+++ b/engine/src/flutter/.ci.yaml
@@ -333,6 +333,7 @@ targets:
     timeout: 60
 
   - name: Mac Host Engine
+    bringup: true
     recipe: engine/engine
     properties:
       gclient_variables: >-
diff --git a/engine/src/flutter/ci/builders/mac_host_engine.json b/engine/src/flutter/ci/builders/mac_host_engine.json
index 4c1f791abdc..6b985e89bb1 100644
--- a/engine/src/flutter/ci/builders/mac_host_engine.json
+++ b/engine/src/flutter/ci/builders/mac_host_engine.json
@@ -10,7 +10,8 @@
                         "out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip",
                         "out/host_debug/zip_archives/dart-sdk-darwin-x64.zip"
                     ],
-                    "name": "host_debug"
+                    "name": "host_debug",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
@@ -66,7 +67,8 @@
                     "include_paths": [
                         "out/host_profile/zip_archives/darwin-x64-profile/artifacts.zip"
                     ],
-                    "name": "host_profile"
+                    "name": "host_profile",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
@@ -120,7 +122,8 @@
                         "out/host_release/zip_archives/darwin-x64-release/artifacts.zip",
                         "out/host_release/zip_archives/darwin-x64/font-subset.zip"
                     ],
-                    "name": "host_release"
+                    "name": "host_release",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
@@ -181,7 +184,8 @@
                         "out/mac_debug_arm64/zip_archives/darwin-arm64/artifacts.zip",
                         "out/mac_debug_arm64/zip_archives/dart-sdk-darwin-arm64.zip"
                     ],
-                    "name": "mac_debug_arm64"
+                    "name": "mac_debug_arm64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
@@ -221,7 +225,8 @@
                     "include_paths": [
                         "out/mac_profile_arm64/zip_archives/darwin-arm64-profile/artifacts.zip"
                     ],
-                    "name": "mac_profile_arm64"
+                    "name": "mac_profile_arm64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
@@ -259,7 +264,8 @@
                         "out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip",
                         "out/mac_release_arm64/zip_archives/darwin-arm64-release/artifacts.zip"
                     ],
-                    "name": "mac_release_arm64"
+                    "name": "mac_release_arm64",
+                    "realm": "production"
                 }
             ],
             "drone_dimensions": [
@@ -385,31 +391,38 @@
     "archives": [
         {
             "source": "out/release/framework/FlutterMacOS.dSYM.zip",
-            "destination": "darwin-x64-release/FlutterMacOS.dSYM.zip"
+            "destination": "darwin-x64-release/FlutterMacOS.dSYM.zip",
+            "realm": "production"
         },
         {
             "source": "out/debug/framework/FlutterMacOS.framework.zip",
-            "destination": "darwin-x64/FlutterMacOS.framework.zip"
+            "destination": "darwin-x64/FlutterMacOS.framework.zip",
+            "realm": "production"
         },
         {
             "source": "out/profile/framework/FlutterMacOS.framework.zip",
-            "destination": "darwin-x64-profile/FlutterMacOS.framework.zip"
+            "destination": "darwin-x64-profile/FlutterMacOS.framework.zip",
+            "realm": "production"
         },
         {
             "source": "out/release/framework/FlutterMacOS.framework.zip",
-            "destination": "darwin-x64-release/FlutterMacOS.framework.zip"
+            "destination": "darwin-x64-release/FlutterMacOS.framework.zip",
+            "realm": "production"
         },
         {
             "source": "out/debug/snapshot/gen_snapshot.zip",
-            "destination": "darwin-x64/gen_snapshot.zip"
+            "destination": "darwin-x64/gen_snapshot.zip",
+            "realm": "production"
         },
         {
             "source": "out/profile/snapshot/gen_snapshot.zip",
-            "destination": "darwin-x64-profile/gen_snapshot.zip"
+            "destination": "darwin-x64-profile/gen_snapshot.zip",
+            "realm": "production"
         },
         {
             "source": "out/release/snapshot/gen_snapshot.zip",
-            "destination": "darwin-x64-release/gen_snapshot.zip"
+            "destination": "darwin-x64-release/gen_snapshot.zip",
+            "realm": "production"
         }
     ]
 }