Revert unintended change to windows host_debug build in engine.py

Bug: https://github.com/flutter/flutter/issues/119794
Change-Id: I088dff4f0e65c5ced842ecd26e7c812318a3fed0
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/38364
Reviewed-by: Zach Anderson <zra@google.com>
Reviewed-by: Brandon DeRosier <bdero@google.com>
Commit-Queue: Zach Anderson <zra@google.com>
diff --git a/recipes/engine/engine.expected/win_flutter.json b/recipes/engine/engine.expected/win_flutter.json
index 98d2b30..0a61928 100644
--- a/recipes/engine/engine.expected/win_flutter.json
+++ b/recipes/engine/engine.expected/win_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_font_subset_flutter.json b/recipes/engine/engine.expected/win_font_subset_flutter.json
index 3f31822..cdb9763 100644
--- a/recipes/engine/engine.expected/win_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_font_subset_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_font_subset_prod.json b/recipes/engine/engine.expected/win_font_subset_prod.json
index fe033ff..4f9601c 100644
--- a/recipes/engine/engine.expected/win_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_font_subset_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_font_subset_staging.json b/recipes/engine/engine.expected/win_font_subset_staging.json
index f12e33e..d4c1306 100644
--- a/recipes/engine/engine.expected/win_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_font_subset_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_no_lto_flutter.json b/recipes/engine/engine.expected/win_no_lto_flutter.json
index 03d1ac3..d7220e4 100644
--- a/recipes/engine/engine.expected/win_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/win_no_lto_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter.json
index 77e9685..cecef32 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/win_no_lto_font_subset_prod.json
index f6d546f..4a8c90e 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/win_no_lto_font_subset_staging.json
index ef8c3bf..bdbe019 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_no_lto_prod.json b/recipes/engine/engine.expected/win_no_lto_prod.json
index 6f5f2e5..8e915fe 100644
--- a/recipes/engine/engine.expected/win_no_lto_prod.json
+++ b/recipes/engine/engine.expected/win_no_lto_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_no_lto_staging.json b/recipes/engine/engine.expected/win_no_lto_staging.json
index 6e55dfd..1b7407e 100644
--- a/recipes/engine/engine.expected/win_no_lto_staging.json
+++ b/recipes/engine/engine.expected/win_no_lto_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_prod.json b/recipes/engine/engine.expected/win_prod.json
index cc21c75..b479e75 100644
--- a/recipes/engine/engine.expected/win_prod.json
+++ b/recipes/engine/engine.expected/win_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_flutter.json b/recipes/engine/engine.expected/win_publish_cipd_flutter.json
index 98d2b30..0a61928 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/win_publish_cipd_font_subset_flutter.json
index 3f31822..cdb9763 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_font_subset_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/win_publish_cipd_font_subset_prod.json
index fe033ff..4f9601c 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_font_subset_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/win_publish_cipd_font_subset_staging.json
index f12e33e..d4c1306 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_font_subset_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_flutter.json
index 03d1ac3..d7220e4 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_flutter.json
index 77e9685..cecef32 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_prod.json
index f6d546f..4a8c90e 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_staging.json
index ef8c3bf..bdbe019 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_font_subset_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_prod.json
index 6f5f2e5..8e915fe 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/win_publish_cipd_no_lto_staging.json
index 6e55dfd..1b7407e 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_no_lto_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_prod.json b/recipes/engine/engine.expected/win_publish_cipd_prod.json
index cc21c75..b479e75 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_publish_cipd_staging.json b/recipes/engine/engine.expected/win_publish_cipd_staging.json
index 24a9adb..feb1e7e 100644
--- a/recipes/engine/engine.expected/win_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/win_publish_cipd_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_staging.json b/recipes/engine/engine.expected/win_staging.json
index 24a9adb..feb1e7e 100644
--- a/recipes/engine/engine.expected/win_staging.json
+++ b/recipes/engine/engine.expected/win_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_flutter.json b/recipes/engine/engine.expected/win_upload_flutter.json
index 479d005..b7279db 100644
--- a/recipes/engine/engine.expected/win_upload_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_flutter.json b/recipes/engine/engine.expected/win_upload_font_subset_flutter.json
index aeec52a..a6043f5 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_prod.json b/recipes/engine/engine.expected/win_upload_font_subset_prod.json
index 1355859..6db8f6e 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_staging.json b/recipes/engine/engine.expected/win_upload_font_subset_staging.json
index 477eece..bf0390e 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_flutter.json b/recipes/engine/engine.expected/win_upload_no_lto_flutter.json
index bde23dc..3b4d341 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter.json
index 07b9f2e..ea5949a 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod.json
index 1969438..a58b2be 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging.json
index 57986c5..e74b8e4 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_prod.json b/recipes/engine/engine.expected/win_upload_no_lto_prod.json
index e7d7630..3aa68ef 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_prod.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_staging.json b/recipes/engine/engine.expected/win_upload_no_lto_staging.json
index 4a5d560..3abcea3 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_staging.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_prod.json b/recipes/engine/engine.expected/win_upload_prod.json
index 5cf916c..75251a6 100644
--- a/recipes/engine/engine.expected/win_upload_prod.json
+++ b/recipes/engine/engine.expected/win_upload_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_flutter.json b/recipes/engine/engine.expected/win_upload_publish_cipd_flutter.json
index 479d005..b7279db 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_flutter.json b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_flutter.json
index aeec52a..a6043f5 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_prod.json b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_prod.json
index 1355859..6db8f6e 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_staging.json b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_staging.json
index 477eece..bf0390e 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_font_subset_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_flutter.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_flutter.json
index bde23dc..3b4d341 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_flutter.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_flutter.json
index 07b9f2e..ea5949a 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_flutter.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_flutter.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_prod.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_prod.json
index 1969438..a58b2be 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_prod.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_staging.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_staging.json
index 57986c5..e74b8e4 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_staging.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_font_subset_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_prod.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_prod.json
index e7d7630..3aa68ef 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_prod.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_staging.json b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_staging.json
index 4a5d560..3abcea3 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_staging.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_no_lto_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_prod.json b/recipes/engine/engine.expected/win_upload_publish_cipd_prod.json
index 5cf916c..75251a6 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_prod.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_prod.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_publish_cipd_staging.json b/recipes/engine/engine.expected/win_upload_publish_cipd_staging.json
index 2b0d98b..755ed38 100644
--- a/recipes/engine/engine.expected/win_upload_publish_cipd_staging.json
+++ b/recipes/engine/engine.expected/win_upload_publish_cipd_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.expected/win_upload_staging.json b/recipes/engine/engine.expected/win_upload_staging.json
index 2b0d98b..755ed38 100644
--- a/recipes/engine/engine.expected/win_upload_staging.json
+++ b/recipes/engine/engine.expected/win_upload_staging.json
@@ -815,14 +815,7 @@
       "-j",
       "1024",
       "-C",
-      "[CACHE]\\builder\\src\\out/host_debug",
-      "flutter:unittests",
-      "flutter/build/archives:artifacts",
-      "flutter/build/archives:embedder",
-      "flutter/tools/font-subset",
-      "flutter/build/archives:dart_sdk_archive",
-      "flutter/shell/platform/windows/client_wrapper:client_wrapper_archive",
-      "flutter/build/archives:windows_flutter"
+      "[CACHE]\\builder\\src\\out/host_debug"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -862,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug flutter:unittests flutter/build/archives:artifacts flutter/build/archives:embedder flutter/tools/font-subset flutter/build/archives:dart_sdk_archive flutter/shell/platform/windows/client_wrapper:client_wrapper_archive flutter/build/archives:windows_flutter"
+    "name": "build host_debug"
   },
   {
     "cmd": [],
diff --git a/recipes/engine/engine.py b/recipes/engine/engine.py
index 0895065..2a4a853 100644
--- a/recipes/engine/engine.py
+++ b/recipes/engine/engine.py
@@ -1542,11 +1542,7 @@
 def BuildWindows(api):
   if api.properties.get('build_host', True):
     RunGN(api, '--runtime-mode', 'debug', '--no-lto', '--prebuilt-dart-sdk')
-    Build(api, 'host_debug', 'flutter:unittests', 'flutter/build/archives:artifacts',
-          'flutter/build/archives:embedder', 'flutter/tools/font-subset',
-          'flutter/build/archives:dart_sdk_archive',
-          'flutter/shell/platform/windows/client_wrapper:client_wrapper_archive',
-          'flutter/build/archives:windows_flutter')
+    Build(api, 'host_debug')
     RunTests(api, 'host_debug', types='engine')
     RunGN(api, '--runtime-mode', 'profile', '--no-lto', '--prebuilt-dart-sdk')
     Build(api, 'host_profile', 'windows', 'flutter:gen_snapshot')