-
Notifications
You must be signed in to change notification settings - Fork 6k
Beta fix macos xcprivacy manifest copy location #55938
Beta fix macos xcprivacy manifest copy location #55938
Conversation
|
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. |
|
I think someone will need to format my gn file, but I'm leaving the office now. |
jmagman
left a comment
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.
LGTM this matches
engine/shell/platform/darwin/macos/BUILD.gn
Line 242 in bf0b4f8
| outputs = [ "$_flutter_framework_dir/Versions/A/Resources/Info.plist" ] |
|
This framework test needs to land first flutter/flutter#157136 |
Done. |
cbracken
left a comment
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.
…on (#157136) The PrivacyInfo.xcprivacy file was originally copied to the top-level macOS framework, but instead needs to be in the Resources directory (which is a different path than iOS). This caused codesigning issues #157016. The path is being corrected flutter/engine#55938 so update the framework test to handle either path. It will be updated to just check the correct path once it rolls into the framework.
Cherry-pick the beta branch privacy location fix #55938 back to master so this doesn't regress in the next beta. This is for flutter/flutter#157016 on master. Can be merged once the framework test flutter/flutter#157318 merges. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
…on (flutter#157136) The PrivacyInfo.xcprivacy file was originally copied to the top-level macOS framework, but instead needs to be in the Resources directory (which is a different path than iOS). This caused codesigning issues flutter#157016. The path is being corrected flutter/engine#55938 so update the framework test to handle either path. It will be updated to just check the correct path once it rolls into the framework.
Cherry-pick the beta branch privacy location fix flutter/engine#55938 back to master so this doesn't regress in the next beta. This is for flutter#157016 on master. Can be merged once the framework test flutter#157318 merges. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style


We were copying the macOS privacy manifest to the wrong path, which led to codesigning failing.
See flutter/flutter#157016 (comment) for more context.