[iOS] Build universal gen_snapshots for iOS #54009

cbracken · 2024-07-19T23:56:20Z

This merges the macOS and iOS rules for creating the gen_snapshot_arm64 and gen_snapshot_x64 used to build for iOS devices, as well as for iOS simulators on both arm64 hosts (gen_snapshot_arm64) and x64 hosts (gen_snapshot_x64). The macOS rules have already been updated to generate universal binaries for each of these that can be run on both Apple Silicon and Intel Mac hosts.

This also updates create_full_ios_framework.py to bundle the newly-generated universal gen_snapshot binaries and produce the artifacts.zip archive that is uploaded via the build config in mac_ios_engine.json.

The create_arm_gen_snapshot rule remains until I'm 100% convinced it's not used for macOS host Android target builds.

Issue: flutter/flutter#69157
Issue: flutter/flutter#103386
Fixes: flutter/flutter#152280

This is stacked on top of #54008.

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
I listed at least one issue that this PR fixes in the description above.
I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
I updated/added relevant documentation (doc comments with ///).
I signed the CLA.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

cbracken · 2024-07-20T00:23:36Z

Looks like a failure trying to symlink the iOS simulator SDK in the ios_debug_sim_arm64_extension_safe build where it can't find the simulator SDK.

Will do some digging to see what's up.

sky/tools/create_full_ios_framework.py

jmagman

comment nit

lib/snapshot/BUILD.gn

jmagman · 2024-07-20T03:05:22Z

Ruh roh

Cannot find gen_snapshot at /Volumes/Work/s/w/ir/cache/builder/src/out/ci/ios_debug/gen_snapshot_arm64

https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8741937051350649649/+/u/Global_generators/Debug-ios-Flutter.xcframework/stdout

This merges the macOS and iOS rules for creating the `gen_snapshot_arm64` and `gen_snapshot_x64` used to build for iOS devices, as well as for iOS simulators on both arm64 hosts (`gen_snapshot_arm64`) and x64 hosts (`gen_snapshot_x64`). The macOS rules have already been updated to generate universal binaries for each of these that can be run on both Apple Silicon and Intel Mac hosts. This also updates `create_full_ios_framework.py` to bundle the newly-generated universal gen_snapshot binaries and produce the artifacts.zip archive that is uploaded via the build config in `mac_ios_engine.json`. The `create_arm_gen_snapshot` rule remains until I'm 100% convinced it's not used for macOS host Android target builds. Issue: flutter/flutter#101138 Issue: flutter/flutter#69157

Also order targets alphabetically for consistency.

cbracken · 2024-07-24T19:48:23Z

Cannot find gen_snapshot at /Volumes/Work/s/w/ir/cache/builder/src/out/ci/ios_debug/gen_snapshot_arm64

Whoops. I guess it would help to actually add the gen_snapshot build target to the targets list in ci/builders/mac_ios_engine.json.

Well, that and me not obeying them despite knowing this.

cbracken · 2024-07-24T20:56:03Z

Turns out that generate_snapshot_bin isn't the target we want, it's generate_snapshot_bins. No further comment.

…#54009)

…152278) flutter/engine@4b95209...eb8fac2 2024-07-24 [email protected] [iOS] Build universal gen_snapshots for iOS (flutter/engine#54009) 2024-07-24 [email protected] Move testing/litetest to pub workspaces. (flutter/engine#54082) 2024-07-24 [email protected] Roll Skia from 1561e2127c6f to 54d1434637a1 (2 revisions) (flutter/engine#54087) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…lutter#152278) flutter/engine@4b95209...eb8fac2 2024-07-24 [email protected] [iOS] Build universal gen_snapshots for iOS (flutter/engine#54009) 2024-07-24 [email protected] Move testing/litetest to pub workspaces. (flutter/engine#54082) 2024-07-24 [email protected] Roll Skia from 1561e2127c6f to 54d1434637a1 (2 revisions) (flutter/engine#54087) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

cbracken requested review from jmagman, zanderso and christopherfujino July 19, 2024 23:56

cbracken changed the title ~~Merge ios macos gen snapshot rules~~ [iOS] Merge iOS/macOS gen_snapshot build rules Jul 19, 2024

cbracken changed the title ~~[iOS] Merge iOS/macOS gen_snapshot build rules~~ [iOS] Build universal gen_snapshots for iOS Jul 19, 2024

zanderso approved these changes Jul 20, 2024

View reviewed changes

sky/tools/create_full_ios_framework.py Show resolved Hide resolved

cbracken force-pushed the merge-ios-macos-gen_snapshot-rules branch 2 times, most recently from 8a03b28 to ade95f2 Compare July 20, 2024 00:42

jmagman approved these changes Jul 20, 2024

View reviewed changes

lib/snapshot/BUILD.gn Outdated Show resolved Hide resolved

cbracken force-pushed the merge-ios-macos-gen_snapshot-rules branch from ade95f2 to 65f71e7 Compare July 24, 2024 18:34

cbracken added 3 commits July 24, 2024 12:30

Use gen_snapshot target for iOS

047b683

Add missing generate_snapshot_bin target

7009f0f

Also order targets alphabetically for consistency.

cbracken force-pushed the merge-ios-macos-gen_snapshot-rules branch from 65f71e7 to 7009f0f Compare July 24, 2024 19:43

cbracken added 3 commits July 24, 2024 12:53

You know what's terrible? JSON's comma rules are terrible.

123f4ab

Well, that and me not obeying them despite knowing this.

Update comment

75897ac

Alright add the target this time

60d916d

cbracken force-pushed the merge-ios-macos-gen_snapshot-rules branch from 8fe22d7 to 60d916d Compare July 24, 2024 20:55

cbracken added the autosubmit Merge PR when tree becomes green via auto submit App label Jul 24, 2024

auto-submit bot merged commit eb8fac2 into flutter:main Jul 24, 2024
31 checks passed

cbracken deleted the merge-ios-macos-gen_snapshot-rules branch July 24, 2024 21:58

engine-flutter-autoroll mentioned this pull request Jul 24, 2024

Roll Flutter Engine from 4b952093cb99 to eb8fac2b1703 (3 revisions) flutter/flutter#152278

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jul 24, 2024

eb8fac2b1 [iOS] Build universal gen_snapshots for iOS (flutter/engine…

575bc10

…#54009)

This was referenced Jul 24, 2024

☂️ [macOS] Support building engine on Apple Silicon without Rosetta flutter/flutter#103386

Open

Build iOS gen_snapshot_arm64 as arm64 binary to run natively on Apple Silicon flutter/flutter#152280

Closed

jmagman mentioned this pull request Oct 3, 2024

Local engine gen_snapshot path is incorrect, gen_snapshot_arm64 not found flutter/flutter#156175

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[iOS] Build universal gen_snapshots for iOS #54009

[iOS] Build universal gen_snapshots for iOS #54009

Uh oh!

cbracken commented Jul 19, 2024 •

edited

Loading

Uh oh!

cbracken commented Jul 20, 2024 •

edited

Loading

Uh oh!

Uh oh!

jmagman left a comment

Uh oh!

Uh oh!

jmagman commented Jul 20, 2024

Uh oh!

cbracken commented Jul 24, 2024

Uh oh!

cbracken commented Jul 24, 2024 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

[iOS] Build universal gen_snapshots for iOS #54009

[iOS] Build universal gen_snapshots for iOS #54009

Uh oh!

Conversation

cbracken commented Jul 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

cbracken commented Jul 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

jmagman left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jmagman commented Jul 20, 2024

Uh oh!

cbracken commented Jul 24, 2024

Uh oh!

cbracken commented Jul 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cbracken commented Jul 19, 2024 •

edited

Loading

cbracken commented Jul 20, 2024 •

edited

Loading

cbracken commented Jul 24, 2024 •

edited

Loading