From ebe7291feedb048d11d9c3c4063eb4048f079386 Mon Sep 17 00:00:00 2001
From: Zachary Anderson <zanderso@users.noreply.github.com>
Date: Mon, 3 Apr 2023 12:31:17 -0700
Subject: [PATCH] Revert "Sync Mac Host Engine with its engine v2 counterpart."
 (flutter/engine#40892)

Reverts flutter/engine#40856

Failure on
https://ci.chromium.org/ui/p/flutter/builders/prod/Mac%20mac_host_engine/2864/overview
---
 .../flutter/ci/builders/mac_host_engine.json  | 55 ++++++-------------
 1 file changed, 16 insertions(+), 39 deletions(-)

diff --git a/engine/src/flutter/ci/builders/mac_host_engine.json b/engine/src/flutter/ci/builders/mac_host_engine.json
index db00782c656..a5e72ade6b8 100644
--- a/engine/src/flutter/ci/builders/mac_host_engine.json
+++ b/engine/src/flutter/ci/builders/mac_host_engine.json
@@ -32,31 +32,14 @@
             "ninja": {
                 "config": "host_debug",
                 "targets": [
-                    "flutter/build/archives:archive_gen_snapshot",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
                     "flutter/build/archives:artifacts",
                     "flutter/build/archives:dart_sdk_archive",
-                    "flutter/build/archives:flutter_embedder_framework",
-		    "flutter/build/dart:copy_dart_sdk",
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
-                    "flutter/tools/font-subset",
-                    "flutter:unittests"
+                    "flutter/build/archives:archive_gen_snapshot",
+                    "flutter/build/archives:flutter_embedder_framework"
                 ]
             },
-            "tests": [
-                {
-                    "language": "python3",
-                    "name": "Host Tests for host_debug",
-                    "parameters": [
-                        "--variant",
-                        "host_debug",
-                        "--type",
-                        "dart",
-                        "--engine-capture-core-dump"
-                    ],
-                    "script": "flutter/testing/run_tests.py",
-                    "type": "local"
-                }
-	    ]
+            "tests": []
         },
         {
             "archives": [
@@ -88,10 +71,9 @@
             "ninja": {
                 "config": "host_profile",
                 "targets": [
-		    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
                     "flutter:unittests"
                 ]
             },
@@ -103,7 +85,7 @@
                         "--variant",
                         "host_profile",
                         "--type",
-                        "dart,engine",
+                        "engine",
                         "--engine-capture-core-dump"
                     ],
                     "script": "flutter/testing/run_tests.py",
@@ -147,22 +129,20 @@
                 "targets": [
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
-		    "flutter/build/dart:copy_dart_sdk",
                     "flutter/impeller/golden_tests:impeller_golden_tests",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
-                    "flutter/tools/font-subset",
-                    "flutter:unittests"
+                    "flutter/tools/font-subset"
                 ]
             },
             "tests": [
                 {
                     "language": "python3",
-                    "name": "Impeller-golden, dart and engine tests for host_release",
+                    "name": "Impeller golden Tests for host_release",
                     "parameters": [
                         "--variant",
                         "host_release",
                         "--type",
-                        "dart,engine,impeller-golden"
+                        "impeller-golden"
                     ],
                     "script": "flutter/testing/run_tests.py",
                     "type": "local"
@@ -202,10 +182,9 @@
             "ninja": {
                 "config": "mac_debug_arm64",
                 "targets": [
-		    "flutter/tools/font-subset",
+                    "flutter/build/archives:dart_sdk_archive",
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
-                    "flutter/build/archives:dart_sdk_archive",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
             },
@@ -216,9 +195,7 @@
                 {
                     "base_path": "out/mac_profile_arm64/zip_archives/",
                     "type": "gcs",
-                    "include_paths": [
-                        "out/mac_profile_arm64/zip_archives/darwin-arm64-profile/artifacts.zip"
-		    ],
+                    "include_paths": [],
                     "name": "mac_profile_arm64"
                 }
             ],
@@ -243,7 +220,7 @@
             "ninja": {
                 "config": "mac_profile_arm64",
                 "targets": [
-                    "flutter/build/archives:artifacts",
+                    "flutter/build/archives:archive_gen_snapshot",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
             },
@@ -255,8 +232,7 @@
                     "base_path": "out/mac_release_arm64/zip_archives/",
                     "type": "gcs",
                     "include_paths": [
-                        "out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip",
-                        "out/mac_release_arm64/zip_archives/arwin-arm64-release/artifacts.zip "
+                        "out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip"
                     ],
                     "name": "mac_release_arm64"
                 }
@@ -282,8 +258,9 @@
             "ninja": {
                 "config": "mac_release_arm64",
                 "targets": [
-                    "flutter/build/archives:artifacts",
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
+                    "flutter/build/archives:archive_gen_snapshot",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
+                    "flutter/tools/font-subset"
                 ]
             },
             "tests": []