Repository navigation
[CP-beta]Revert "Directly generate a Mach-O dynamic library using gen_snapshot [reland] (#174870) - #180687
Conversation
… [reland] (flutter#174870) (flutter#180639) This reverts commit 4b6e0bd. Fixes flutter#178602. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [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]. **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 [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
|
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. |
|
@vashworth please fill out the PR description above, afterwards the release team will review this request. |
github-actions
Bot
added
tool
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request reverts the mechanism for generating AOT snapshots on Apple platforms. Instead of directly generating a Mach-O dynamic library from gen_snapshot, the tool will now generate an assembly file (.S) and then use xcrun cc and xcrun clang to compile and link it into a framework. This change is reflected across the AOTSnapshotter implementation and its corresponding tests. My review identifies a missing deployment target flag for macOS builds, which could lead to incorrect builds, and suggests a fix along with corresponding test updates.
| if (isIOS) | ||
| // When the minimum version is updated, remember to update | ||
| // template MinimumOSVersion. | ||
| // https://github.com/flutter/flutter/pull/62902 | ||
| '-miphoneos-version-min=${FlutterDarwinPlatform.ios.deploymentTarget()}', |
There was a problem hiding this comment.
The macOS deployment target version is missing. The previous implementation correctly set --macho-min-os-version for both iOS and macOS. This logic should be preserved by adding -mmacosx-version-min for macOS builds to ensure the correct deployment target is used.
| if (isIOS) | |
| // When the minimum version is updated, remember to update | |
| // template MinimumOSVersion. | |
| // https://github.com/flutter/flutter/pull/62902 | |
| '-miphoneos-version-min=${FlutterDarwinPlatform.ios.deploymentTarget()}', | |
| if (isIOS) | |
| // When the minimum version is updated, remember to update | |
| // template MinimumOSVersion. | |
| // https://github.com/flutter/flutter/pull/62902 | |
| '-miphoneos-version-min=${FlutterDarwinPlatform.ios.deploymentTarget()}' | |
| else | |
| '-mmacosx-version-min=${FlutterDarwinPlatform.macos.deploymentTarget()}', |
| FakeCommand( | ||
| command: <String>[ | ||
| 'xcrun', | ||
| 'cc', | ||
| '-arch', | ||
| 'arm64', | ||
| '-c', | ||
| environment.buildDir.childFile('arm64/snapshot_assembly.S').path, | ||
| '-o', | ||
| environment.buildDir.childFile('arm64/snapshot_assembly.o').path, | ||
| ], | ||
| ), | ||
| FakeCommand( | ||
| command: <String>[ | ||
| 'xcrun', | ||
| 'cc', | ||
| '-arch', | ||
| 'x86_64', | ||
| '-c', | ||
| environment.buildDir.childFile('x86_64/snapshot_assembly.S').path, | ||
| '-o', | ||
| environment.buildDir.childFile('x86_64/snapshot_assembly.o').path, | ||
| ], | ||
| ), | ||
| FakeCommand( | ||
| command: <String>[ | ||
| 'xcrun', | ||
| 'clang', | ||
| '-arch', | ||
| 'arm64', | ||
| '-dynamiclib', | ||
| '-Xlinker', | ||
| '-rpath', | ||
| '-Xlinker', | ||
| '@executable_path/Frameworks', | ||
| '-Xlinker', | ||
| '-rpath', | ||
| '-Xlinker', | ||
| '@loader_path/Frameworks', | ||
| '-fapplication-extension', | ||
| '-install_name', | ||
| '@rpath/App.framework/App', | ||
| '-o', | ||
| environment.buildDir.childFile('arm64/App.framework/App').path, | ||
| environment.buildDir.childFile('arm64/snapshot_assembly.o').path, | ||
| ], | ||
| ), | ||
| FakeCommand( | ||
| command: <String>[ | ||
| 'xcrun', | ||
| 'clang', | ||
| '-arch', | ||
| 'x86_64', | ||
| '-dynamiclib', | ||
| '-Xlinker', | ||
| '-rpath', | ||
| '-Xlinker', | ||
| '@executable_path/Frameworks', | ||
| '-Xlinker', | ||
| '-rpath', | ||
| '-Xlinker', | ||
| '@loader_path/Frameworks', | ||
| '-fapplication-extension', | ||
| '-install_name', | ||
| '@rpath/App.framework/App', | ||
| '-o', | ||
| environment.buildDir.childFile('x86_64/App.framework/App').path, | ||
| environment.buildDir.childFile('x86_64/snapshot_assembly.o').path, | ||
| ], | ||
| ), |
There was a problem hiding this comment.
The test commands for cc and clang on macOS are missing the -mmacosx-version-min flag. To align with the suggested change in packages/flutter_tools/lib/src/base/build.dart and ensure tests are accurate, this flag should be added to all cc and clang fake commands for macOS.
For example, the cc command for arm64 should include -mmacosx-version-min=10.15.
|
Closing as the original PR to master made the cut for the upcoming beta release that is a WIP. |
3 participants
This pull request is created by automatic cherry pick workflow
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?
#178602
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 reverts a change that causes all iOS App Store uploads to fail validation.
Changelog Description:
Explain this cherry pick:
See best practices for examples.
< Replace with changelog description here >
[flutter/178602] When uploading iOS apps to the App Store, validation may fail due to invalid binary error.
Workaround:
Is there a workaround for this issue?
No
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?