[gn + codesign] mac code sign configuration for FlutterMacOS.framework.zip #35707
+23
−2
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,6 +127,11 @@ def regenerate_symlinks(fat_framework): | |
| ) | ||
|
|
||
|
|
||
| def embed_codesign_configuration(config_path, content): | ||
| with open(config_path, 'w') as f: | ||
| f.write(content) | ||
|
|
||
|
|
||
| def process_framework(dst, args, fat_framework, fat_framework_binary): | ||
| if args.dsym: | ||
| dsym_out = os.path.splitext(fat_framework)[0] + '.dSYM' | ||
|
|
@@ -152,6 +157,30 @@ def process_framework(dst, args, fat_framework, fat_framework_binary): | |
| ], | ||
| cwd=dst) | ||
|
|
||
| macos_filepath_with_entitlements = '' | ||
| macos_filepath_without_entitlements = 'FlutterMacOS.framework/Versions/A/FlutterMacOS' | ||
|
|
||
| embed_codesign_configuration( | ||
| os.path.join(dst, 'entitlements.txt'), macos_filepath_with_entitlements | ||
| ) | ||
|
|
||
| embed_codesign_configuration( | ||
| os.path.join(dst, 'without_entitlements.txt'), | ||
| macos_filepath_without_entitlements | ||
| ) | ||
|
|
||
| # Zip FlutterMacOS.framework. | ||
| subprocess.check_call([ | ||
|
There was a problem hiding this comment. Sorry didn't realize there is an engine PR review on Thursday. These There was a problem hiding this comment. Inspecting locally, looks like the symlinks are dropped in the build process. Current assumption is based on #35673. There was a problem hiding this comment. Is this ready for review? |
||
| 'zip', | ||
| '-r', | ||
godofredoc marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| '-y', | ||
| 'FlutterMacOS.framework.zip', | ||
| 'FlutterMacOS.framework', | ||
| 'entitlements.txt', | ||
| 'without_entitlements.txt', | ||
| ], | ||
| cwd=dst) | ||
|
|
||
|
|
||
| if __name__ == '__main__': | ||
| sys.exit(main()) | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should lines 160 to 170 be moved to line 151 and remove the zipping subprocess? as it is we are zipping twice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, updated to zip only once. Yeah I remember this artifact was historically unzipped twice (https://github.com/christopherfujino/codesign.py/blob/master/codesign.py#L151) for some reasons, but verified just now and it looks there we can do a single zip/unzip.
Also it's interesting that if i double click to extract the artifact, the symlinks are not preserved. But if i use the subprocess command "unzip.. -d .." then the symlinks are preserved in the extracted file.