This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Adds a script the generates and bundle the ios artifacts. #35168
Conversation
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
This is to simplify the migration to engine_v2 recipes and can potentially simplify the existing recipes moving most of the logic to the engine repository. Bug: flutter/flutter#81855
jmagman
reviewed
Aug 4, 2022
Comment on lines
41
to
44
| # TODO(gw280): Remove --simulator-out-dir alias when all recipes are updated | ||
| parser.add_argument( | ||
| '--simulator-x64-out-dir', '--simulator-out-dir', type=str, required=True | ||
| ) |
Member
There was a problem hiding this comment.
I think this was done as of https://flutter-review.googlesource.com/c/recipes/+/14780, should be safe to remove the TODO and alias.
| parser.add_argument('--clang-dir', type=str, default='clang_x64') | ||
| parser.add_argument('--x64-out-dir', type=str) | ||
| parser.add_argument('--arm64-out-dir', type=str, required=True) | ||
| parser.add_argument('--armv7-out-dir', type=str, required=False) |
Member
There was a problem hiding this comment.
Nothing should be using this arg anymore as of https://flutter-review.googlesource.com/c/recipes/+/29060, all armv7 logic should be removed. I guess we missed that cleanup in
Suggested change
| parser.add_argument('--armv7-out-dir', type=str, required=False) |
Member
There was a problem hiding this comment.
Argument is still here, are we calling it somewhere?
Comment on lines
88
to
155
| framework = os.path.join(dst, 'Flutter.framework') | ||
| simulator_framework = os.path.join(dst, 'sim', 'Flutter.framework') | ||
| arm64_framework = os.path.join(arm64_out_dir, 'Flutter.framework') | ||
| simulator_x64_framework = os.path.join( | ||
| simulator_x64_out_dir, 'Flutter.framework' | ||
| ) | ||
| if args.simulator_arm64_out_dir is not None: | ||
| simulator_arm64_framework = os.path.join( | ||
| args.simulator_arm64_out_dir, 'Flutter.framework' | ||
| ) | ||
| simulator_arm64_dylib = os.path.join(simulator_arm64_framework, 'Flutter') | ||
|
|
||
| arm64_dylib = os.path.join(arm64_framework, 'Flutter') | ||
| simulator_x64_dylib = os.path.join(simulator_x64_framework, 'Flutter') | ||
|
|
||
| if not os.path.isdir(arm64_framework): | ||
| print('Cannot find iOS arm64 Framework at %s' % arm64_framework) | ||
| return 1 | ||
|
|
||
| if not os.path.isdir(simulator_x64_framework): | ||
| print('Cannot find iOS x64 simulator Framework at %s' % simulator_framework) | ||
| return 1 | ||
|
|
||
| if not os.path.isfile(arm64_dylib): | ||
| print('Cannot find iOS arm64 dylib at %s' % arm64_dylib) | ||
| return 1 | ||
|
|
||
| if not os.path.isfile(simulator_x64_dylib): | ||
| print('Cannot find iOS simulator dylib at %s' % simulator_dylib) | ||
| return 1 | ||
|
|
||
| if not os.path.isfile(DSYMUTIL): | ||
| print('Cannot find dsymutil at %s' % DSYMUTIL) | ||
| return 1 | ||
|
|
||
| shutil.rmtree(framework, True) | ||
| shutil.copytree(arm64_framework, framework) | ||
| framework_binary = os.path.join(framework, 'Flutter') | ||
| process_framework(args, framework, framework_binary) | ||
|
|
||
| if args.simulator_arm64_out_dir is not None: | ||
| shutil.rmtree(simulator_framework, True) | ||
| shutil.copytree(simulator_arm64_framework, simulator_framework) | ||
|
|
||
| simulator_framework_binary = os.path.join(simulator_framework, 'Flutter') | ||
|
|
||
| # Create the arm64/x64 simulator fat framework. | ||
| subprocess.check_call([ | ||
| 'lipo', simulator_x64_dylib, simulator_arm64_dylib, '-create', | ||
| '-output', simulator_framework_binary | ||
| ]) | ||
| process_framework(args, simulator_framework, simulator_framework_binary) | ||
| simulator_framework = simulator_framework | ||
| else: | ||
| simulator_framework = simulator_x64_framework | ||
|
|
||
| # Create XCFramework from the arm-only fat framework and the arm64/x64 simulator frameworks, or just the | ||
| # x64 simulator framework if only that one exists. | ||
| xcframeworks = [simulator_framework, framework] | ||
| create_xcframework(location=dst, name='Flutter', frameworks=xcframeworks) | ||
|
|
||
| # Add the x64 simulator into the fat framework | ||
| subprocess.check_call([ | ||
| 'lipo', arm64_dylib, simulator_x64_dylib, '-create', '-output', | ||
| framework_binary | ||
| ]) | ||
|
|
||
| process_framework(args, framework, framework_binary) |
Member
There was a problem hiding this comment.
Can you pull this out into a function called create_framework or something similar so it's the same abstraction level as generate_gen_snapshot and zip_archive?
jmagman
approved these changes
Aug 5, 2022
Member
jmagman
left a comment
jmagman
left a comment
There was a problem hiding this comment.
LGTM, with nit about removing last armv7 reference.
| parser.add_argument('--clang-dir', type=str, default='clang_x64') | ||
| parser.add_argument('--x64-out-dir', type=str) | ||
| parser.add_argument('--arm64-out-dir', type=str, required=True) | ||
| parser.add_argument('--armv7-out-dir', type=str, required=False) |
Member
There was a problem hiding this comment.
Argument is still here, are we calling it somewhere?
Contributor
Author
Removed it, I missed it in the last commit. |
godofredoc
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Aug 5, 2022
betrevisan
pushed a commit
to betrevisan/engine
that referenced
this pull request
Aug 5, 2022
emilyabest
pushed a commit
to emilyabest/engine
that referenced
this pull request
Aug 12, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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.
This is to simplify the migration to engine_v2 recipes and can potentially simplify the existing recipes moving most of the logic to the engine repository.
Bug: flutter/flutter#81855
Pre-launch Checklist
writing and running engine tests.
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.