From fdc93bb8cc874a30fc4e0c50a9e1650e588f049f Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Tue, 16 Jul 2024 17:17:36 -0700 Subject: [PATCH 1/2] [macOS] Archive universal gen_snapshot binaries In #53524, we started producing universal `gen_snapshot_arm64` and `gen_snapshot_x64` binaries. This migrates away from bundling `gen_snapshot` binaries with x64-only host architecture to universal binaries that bundle both x64 and arm64 host architectures. Issue: https://github.com/flutter/flutter/issues/101138 Issue: https://github.com/flutter/flutter/issues/69157 --- ci/builders/mac_host_engine.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index a4ed772663ac4..ca19c570463ba 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -558,9 +558,9 @@ "--dst", "out/debug/snapshot", "--arm64-path", - "out/ci/mac_debug_arm64/clang_x64/gen_snapshot", + "out/ci/mac_debug_arm64/gen_snapshot_arm64", "--x64-path", - "out/ci/host_debug/gen_snapshot", + "out/ci/host_debug/gen_snapshot_x64", "--zip" ], "script": "flutter/sky/tools/create_macos_gen_snapshots.py" @@ -571,9 +571,9 @@ "--dst", "out/profile/snapshot", "--arm64-path", - "out/ci/mac_profile_arm64/clang_x64/gen_snapshot", + "out/ci/mac_profile_arm64/gen_snapshot_arm64", "--x64-path", - "out/ci/host_profile/gen_snapshot", + "out/ci/host_profile/gen_snapshot_x64", "--zip" ], "script": "flutter/sky/tools/create_macos_gen_snapshots.py" @@ -584,9 +584,9 @@ "--dst", "out/release/snapshot", "--arm64-path", - "out/ci/mac_release_arm64/clang_x64/gen_snapshot", + "out/ci/mac_release_arm64/gen_snapshot_arm64", "--x64-path", - "out/ci/host_release/gen_snapshot", + "out/ci/host_release/gen_snapshot_x64", "--zip" ], "script": "flutter/sky/tools/create_macos_gen_snapshots.py" From 840ed6e8abbee9ec28cfdd226a9433344a71a15b Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Wed, 17 Jul 2024 10:42:10 -0700 Subject: [PATCH 2/2] Add missing dependency for profile gen_snapshot --- ci/builders/mac_host_engine.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index ca19c570463ba..c774fdeedeb73 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -368,6 +368,7 @@ "config": "ci/mac_profile_arm64", "targets": [ "flutter/build/archives:artifacts", + "flutter/lib/snapshot:create_macos_gen_snapshots", "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework" ] },