Remove bitcode from iOS artifacts

Upload same no-bitcode version to both `ios-release` and `ios-release-nobitcode` buckets until the `nobitcode` is safe to remove.

`--no-goma` to be removed from release build in future cl: https://github.com/flutter/flutter/issues/107888

Bug: https://github.com/flutter/flutter/issues/107886
Change-Id: Ia622738798802e264153ab4fa0f39e00dc33aaef
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/34583
Reviewed-by: Zach Anderson <zra@google.com>
Commit-Queue: Jenn Magder <magder@google.com>
diff --git a/recipes/engine/engine.expected/mac.json b/recipes/engine/engine.expected/mac.json
index da5f886..158cdc9 100644
--- a/recipes/engine/engine.expected/mac.json
+++ b/recipes/engine/engine.expected/mac.json
@@ -10693,7 +10693,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -10730,7 +10729,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -11589,7 +11588,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -11626,7 +11624,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -12259,7 +12257,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
@@ -12297,7 +12294,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [
@@ -12562,99 +12559,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_font_subset.json b/recipes/engine/engine.expected/mac_font_subset.json
index da5f886..158cdc9 100644
--- a/recipes/engine/engine.expected/mac_font_subset.json
+++ b/recipes/engine/engine.expected/mac_font_subset.json
@@ -10693,7 +10693,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -10730,7 +10729,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -11589,7 +11588,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -11626,7 +11624,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -12259,7 +12257,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
@@ -12297,7 +12294,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [
@@ -12562,99 +12559,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_no_lto.json b/recipes/engine/engine.expected/mac_no_lto.json
index e49203e..186fea2 100644
--- a/recipes/engine/engine.expected/mac_no_lto.json
+++ b/recipes/engine/engine.expected/mac_no_lto.json
@@ -10700,7 +10700,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -10738,7 +10737,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -11597,7 +11596,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -11635,7 +11633,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -12268,7 +12266,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
@@ -12307,7 +12304,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [
@@ -12572,99 +12569,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset.json b/recipes/engine/engine.expected/mac_no_lto_font_subset.json
index e49203e..186fea2 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset.json
@@ -10700,7 +10700,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -10738,7 +10737,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -11597,7 +11596,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -11635,7 +11633,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -12268,7 +12266,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
@@ -12307,7 +12304,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [
@@ -12572,99 +12569,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_publish_cipd.json b/recipes/engine/engine.expected/mac_publish_cipd.json
index da5f886..158cdc9 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd.json
@@ -10693,7 +10693,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -10730,7 +10729,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -11589,7 +11588,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -11626,7 +11624,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -12259,7 +12257,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
@@ -12297,7 +12294,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [
@@ -12562,99 +12559,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_font_subset.json b/recipes/engine/engine.expected/mac_publish_cipd_font_subset.json
index da5f886..158cdc9 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_font_subset.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_font_subset.json
@@ -10693,7 +10693,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -10730,7 +10729,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -11589,7 +11588,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -11626,7 +11624,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -12259,7 +12257,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
@@ -12297,7 +12294,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [
@@ -12562,99 +12559,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto.json
index e49203e..186fea2 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto.json
@@ -10700,7 +10700,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -10738,7 +10737,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -11597,7 +11596,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -11635,7 +11633,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -12268,7 +12266,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
@@ -12307,7 +12304,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [
@@ -12572,99 +12569,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset.json b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset.json
index e49203e..186fea2 100644
--- a/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/mac_publish_cipd_no_lto_font_subset.json
@@ -10700,7 +10700,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -10738,7 +10737,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -11597,7 +11596,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -11635,7 +11633,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -12268,7 +12266,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
@@ -12307,7 +12304,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [
@@ -12572,99 +12569,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_upload.json b/recipes/engine/engine.expected/mac_upload.json
index 80a7645..b8fa4e8 100644
--- a/recipes/engine/engine.expected/mac_upload.json
+++ b/recipes/engine/engine.expected/mac_upload.json
@@ -11866,7 +11866,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -11903,7 +11902,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -12866,7 +12865,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -12903,7 +12901,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -13587,7 +13585,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
@@ -13625,7 +13622,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [
@@ -13992,99 +13989,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset.json b/recipes/engine/engine.expected/mac_upload_font_subset.json
index a3267e1..86a695f 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset.json
@@ -11968,7 +11968,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -12005,7 +12004,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -12968,7 +12967,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -13005,7 +13003,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -13689,7 +13687,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
@@ -13727,7 +13724,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [
@@ -14094,99 +14091,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto.json b/recipes/engine/engine.expected/mac_upload_no_lto.json
index 954a67d..fd64291 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto.json
@@ -11873,7 +11873,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -11911,7 +11910,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -12874,7 +12873,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -12912,7 +12910,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -13596,7 +13594,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
@@ -13635,7 +13632,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [
@@ -14002,99 +13999,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset.json
index f4a33eb..3c88319 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset.json
@@ -11975,7 +11975,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -12013,7 +12012,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -12976,7 +12975,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -13014,7 +13012,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -13698,7 +13696,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
@@ -13737,7 +13734,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [
@@ -14104,99 +14101,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd.json b/recipes/engine/engine.expected/mac_upload_publish_cipd.json
index 80a7645..b8fa4e8 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd.json
@@ -11866,7 +11866,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -11903,7 +11902,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -12866,7 +12865,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -12903,7 +12901,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -13587,7 +13585,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
@@ -13625,7 +13622,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [
@@ -13992,99 +13989,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset.json
index a3267e1..86a695f 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_font_subset.json
@@ -11968,7 +11968,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -12005,7 +12004,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -12968,7 +12967,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
     ],
@@ -13005,7 +13003,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [],
@@ -13689,7 +13687,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
@@ -13727,7 +13724,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc"
   },
   {
     "cmd": [
@@ -14094,99 +14091,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto.json
index 954a67d..fd64291 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto.json
@@ -11873,7 +11873,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -11911,7 +11910,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -12874,7 +12873,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -12912,7 +12910,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -13596,7 +13594,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
@@ -13635,7 +13632,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [
@@ -14002,99 +13999,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset.json b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset.json
index f4a33eb..3c88319 100644
--- a/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset.json
+++ b/recipes/engine/engine.expected/mac_upload_publish_cipd_no_lto_font_subset.json
@@ -11975,7 +11975,6 @@
       "--ios",
       "--runtime-mode",
       "debug",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -12013,7 +12012,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode debug --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode debug --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -12976,7 +12975,6 @@
       "--ios",
       "--runtime-mode",
       "profile",
-      "--bitcode",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
       "--no-lto"
@@ -13014,7 +13012,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode profile --bitcode --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode profile --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [],
@@ -13698,7 +13696,6 @@
       "--ios",
       "--runtime-mode",
       "release",
-      "--bitcode",
       "--no-goma",
       "--prebuilt-impellerc",
       "[CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc",
@@ -13737,7 +13734,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gn --ios --runtime-mode release --bitcode --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
+    "name": "gn --ios --runtime-mode release --no-goma --prebuilt-impellerc [CACHE]/builder/src/out/ios_debug_sim/clang_x64/impellerc --no-lto"
   },
   {
     "cmd": [
@@ -14104,99 +14101,6 @@
   },
   {
     "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_ios_framework.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release",
-      "--simulator-x64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim",
-      "--simulator-arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_debug_sim_arm64",
-      "--strip-bitcode",
-      "--dsym",
-      "--strip"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create iOS release Flutter.xcframework (2)"
-  },
-  {
-    "cmd": [
-      "[CACHE]/builder/src/flutter/sky/tools/create_macos_gen_snapshots.py",
-      "--dst",
-      "[CACHE]/builder/src/out/release",
-      "--arm64-out-dir",
-      "[CACHE]/builder/src/out/ios_release"
-    ],
-    "cwd": "[CACHE]/builder/src",
-    "env": {
-      "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
-      "FLUTTER_LOGS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "FLUTTER_PREBUILT_DART_SDK": "True",
-      "FLUTTER_TEST_OUTPUTS_DIR": "[CLEANUP]/flutter_logs_dir",
-      "GOMA_DIR": "[CACHE]/goma/client"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]/builder/src/third_party/dart/tools/sdks/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "luci_context": {
-      "realm": {
-        "name": "flutter:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Create macOS release gen_snapshot (3)"
-  },
-  {
-    "cmd": [
       "python",
       "RECIPE_MODULE[flutter::zip]/resources/zip.py"
     ],
diff --git a/recipes/engine/engine.py b/recipes/engine/engine.py
index 64b8785..a9aa4fa 100644
--- a/recipes/engine/engine.py
+++ b/recipes/engine/engine.py
@@ -1350,8 +1350,7 @@
     arm64_out,
     sim_x64_out,
     sim_arm64_out,
-    bucket_name,
-    strip_bitcode=False
+    bucket_names=[],
 ):
   checkout = GetCheckoutPath(api)
   out_dir = checkout.join('out')
@@ -1370,9 +1369,6 @@
       api.path.join(out_dir, sim_arm64_out),
   ]
 
-  if strip_bitcode:
-    create_ios_framework_cmd.append('--strip-bitcode')
-
   if label == 'release':
     create_ios_framework_cmd.extend([
         "--dsym",
@@ -1406,26 +1402,26 @@
   ]
 
   label_root = checkout.join('out', label)
-  UploadArtifacts(
-      api,
-      bucket_name,
-      file_artifacts,
-      directory_artifacts,
-      pkg_root=label_root
-  )
+  for bucket_name in bucket_names:
+    UploadArtifacts(
+        api,
+        bucket_name,
+        file_artifacts,
+        directory_artifacts,
+        pkg_root=label_root
+    )
 
-  if label == 'release':
-    dsym_zip = label_dir.join('Flutter.dSYM.zip')
-    pkg = api.zip.make_package(label_dir, dsym_zip)
-    pkg.add_directory(label_dir.join('Flutter.dSYM'))
-    pkg.zip('Zip Flutter.dSYM')
-    remote_name = '%s/Flutter.dSYM.zip' % bucket_name
-    remote_zip = GetCloudPath(api, remote_name)
-    api.bucket_util.safe_upload(dsym_zip, remote_zip)
+    if label == 'release':
+      dsym_zip = label_dir.join('Flutter.dSYM.zip')
+      pkg = api.zip.make_package(label_dir, dsym_zip)
+      pkg.add_directory(label_dir.join('Flutter.dSYM'))
+      pkg.zip('Zip Flutter.dSYM')
+      remote_name = '%s/Flutter.dSYM.zip' % bucket_name
+      remote_zip = GetCloudPath(api, remote_name)
+      api.bucket_util.safe_upload(dsym_zip, remote_zip)
 
 
 def BuildIOS(api):
-  # Simulator doesn't use bitcode.
   # Simulator binary is needed in all runtime modes.
   RunGN(api, '--ios', '--runtime-mode', 'debug', '--simulator', '--no-lto')
   Build(api, 'ios_debug_sim')
@@ -1452,7 +1448,7 @@
 
   if api.properties.get('ios_debug', True):
     RunGN(
-        api, '--ios', '--runtime-mode', 'debug', '--bitcode',
+        api, '--ios', '--runtime-mode', 'debug',
         '--prebuilt-impellerc', impellerc_path
     )
     Build(api, 'ios_debug')
@@ -1461,39 +1457,33 @@
 
     PackageIOSVariant(
         api, 'debug', 'ios_debug', 'ios_debug_sim',
-        'ios_debug_sim_arm64', 'ios'
+        'ios_debug_sim_arm64', ['ios']
     )
 
   if api.properties.get('ios_profile', True):
     RunGN(
-        api, '--ios', '--runtime-mode', 'profile', '--bitcode',
+        api, '--ios', '--runtime-mode', 'profile',
         '--prebuilt-impellerc', impellerc_path
     )
     Build(api, 'ios_profile')
 
     PackageIOSVariant(
         api, 'profile', 'ios_profile', 'ios_debug_sim',
-        'ios_debug_sim_arm64', 'ios-profile'
+        'ios_debug_sim_arm64', ['ios-profile']
     )
 
   if api.properties.get('ios_release', True):
     RunGN(
-        api, '--ios', '--runtime-mode', 'release', '--bitcode', '--no-goma',
+        api, '--ios', '--runtime-mode', 'release', '--no-goma',
         '--prebuilt-impellerc', impellerc_path
     )
     AutoninjaBuild(api, 'ios_release')
 
+    # Bitcode has been deprecated, upload the same artifact
+    # to ios-release and ios-release-nobitcode buckets.
     PackageIOSVariant(
         api, 'release', 'ios_release', 'ios_debug_sim',
-        'ios_debug_sim_arm64', 'ios-release'
-    )
-
-    # Create a bitcode-stripped version. This will help customers who do not
-    # need bitcode, which significantly increases download size. This should
-    # be removed when bitcode is enabled by default in Flutter.
-    PackageIOSVariant(
-        api, 'release', 'ios_release', 'ios_debug_sim',
-        'ios_debug_sim_arm64', 'ios-release-nobitcode', True
+        'ios_debug_sim_arm64', ['ios-release', 'ios-release-nobitcode']
     )
 
 
diff --git a/recipes/engine/engine_unopt.py b/recipes/engine/engine_unopt.py
index 9d139b7..260a444 100644
--- a/recipes/engine/engine_unopt.py
+++ b/recipes/engine/engine_unopt.py
@@ -173,7 +173,6 @@
 
 
 def BuildIOS(api):
-  # Simulator doesn't use bitcode.
   # Simulator binary is needed in all runtime modes.
   RunGN(api, '--ios', '--runtime-mode', 'debug', '--simulator', '--no-lto')
   Build(api, 'ios_debug_sim')