Compile snapshot_assembly with sdk root set in Xcode#69731
Merged
jmagman merged 1 commit intoflutter:masterfrom Nov 4, 2020
Merged
Compile snapshot_assembly with sdk root set in Xcode#69731jmagman merged 1 commit intoflutter:masterfrom
jmagman merged 1 commit intoflutter:masterfrom
Conversation
9 tasks
jmagman
commented
Nov 4, 2020
Member
Author
There was a problem hiding this comment.
We take the architecture from the build settings instead.
Comment on lines
483
to
487
Member
Author
There was a problem hiding this comment.
This will be used in the next PR when the debug App.framework is migrated.
Comment on lines
378
to
380
Member
Author
There was a problem hiding this comment.
This is actually wrong and isn't building anything for the simulator, but that's what it was doing before this PR. Will fix in the next PR.
Member
|
😮 TIL you can quote multiple code lines' permalinks |
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
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.
Description
With the upcoming support for Apple Silicon ARM simulators, App.framework can no longer contain architectures for both
iphoneosandiphonesimulatorsince they need to be build against different SDKs, but they can no longer belipod together (lipocomplains both binaries contain arm64 and fails).Primarily this is a problem when building the debug stub framework:
flutter/packages/flutter_tools/lib/src/build_system/targets/ios.dart
Lines 106 to 111 in cb67513
And in
flutter build ios-frameworkthat smush together plugin frameworks.iphoneosandiphonesimulatordirectories - done with Build App.framework directly to build directory #69699.iphoneosandiphonesimulatorSDK from Xcode instead of trying to guess from the architectures (to stop assuming x86 == simulator). Use it foraot(this PR).lipoing from debug stub framework step and only use the requestediphoneosoriphonesimulatorSDK, not for both. Refactorflutter build ios-frameworkas needed (next PR).flutter build ios-framework --universal- Deprecate build ios-framework --universal #69720flutter build aot- Deprecate and replace build aot #49562This PR actually doesn't change any behavior, but I did steps 2 and 3 at the same time and the patch is too large to easily review. Some of this will make more sense on the next PR.
Related Issues
Support #69334