[CP-stable] Update iOS tools to fat binaries (#185868)#186064
Merged
auto-submit[bot] merged 2 commits intoMay 6, 2026
Merged
Conversation
Updates iOS tools to a new path in GCS where they are built with both x86 and arm. On ARM Apple Silicon Macs, these will run natively without requiring Rosetta. Binaries are code-signed and fat as expected: ``` SHARD=verify_binaries_pre_codesigned bin/cache/dart-sdk/bin/dart dev/bots/test.dart ▌20:17:40▐ STARTING ANALYSIS ▌20:17:41▐ SHARD=verify_binaries_pre_codesigned ▌20:17:41▐ Running binaries codesign verification ▌20:18:30▐ Test successful. ``` Fixes flutter#121178 and flutter#185384 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. If this change needs to override an active code freeze, provide a comment explaining why. The code freeze workflow can be overridden by code reviewers. See pinned issues for any active code freezes with guidance. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
Contributor
There was a problem hiding this comment.
Code Review
This pull request introduces several improvements and fixes, including adding a workaround for Xcode's git multi-pack-index incompatibility, implementing fat binary verification for iOS/macOS, and adding support for web-define variables in web builds. It also includes a fix for potential integer overflows in animated PNG handling and updates the Flutter status bar tap handling to improve scroll-to-top behavior on iOS. The review comment regarding the Podfile.lock parsing error handling was addressed by suggesting a more visible warning.
| } | ||
| } | ||
| } on Exception catch (e) { | ||
| globals.logger.printTrace('Failed to parse podfile.lock: $e'); |
Contributor
There was a problem hiding this comment.
If parsing Podfile.lock fails, it might be better to log a warning instead of just a trace message. A trace message can be easily missed, and the subsequent incomplete dependency analysis could lead to confusing build failures if a transitive dependency is excluding the arm64 architecture. A warning would make the user aware of the potential issue.
globals.logger.printWarning('Failed to parse Podfile.lock: $e. This may lead to an incomplete dependency analysis for iOS builds.');|
This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter. Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed. |
jmagman
approved these changes
May 5, 2026
5 tasks
walley892
approved these changes
May 6, 2026
6a4dc79
into
flutter:flutter-3.41-candidate.0
133 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request.
Issue Link:
What is the link to the issue this cherry-pick is addressing?
#121178
Impact Description:
What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)?
Does it impact development (ex. flutter doctor crashes when Android Studio is installed),
or the shipping of production apps (the app crashes on launch).
This information is for domain experts and release engineers to understand the consequences of saying yes or no to the cherry pick.
This build iOS tooling as fat binaries (arm and x86) so that is no longer requires Rosetta. Rosetta is being sunset and Apple is apparently already showing warnings when x86 binaries are used with Rosetta: https://www.macrumors.com/2026/02/16/macos-tahoe-26-4-rosetta-2-warnings/
Changelog Description:
Explain this cherry pick:
See best practices for examples.
[flutter/121178] When running your app on a physical iOS device, binary tools used to deploy the app are only built with x86 and therefore require Rosetta.
Workaround:
Is there a workaround for this issue?
Ignore warnings
Risk:
What is the risk level of this cherry-pick?
Test Coverage:
Are you confident that your fix is well-tested by automated tests?
Validation Steps:
What are the steps to validate that this fix works?
Run and deploy to an iOS device (validated by CI)