-
Notifications
You must be signed in to change notification settings - Fork 260
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add support for macos in apple_*_xcframework
rules
#2459
Draft
luispadron
wants to merge
1
commit into
master
Choose a base branch
from
luis/add-support-for-macos-xcframeworks
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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 |
---|---|---|
|
@@ -202,7 +202,7 @@ def _group_link_outputs_by_library_identifier( | |
|
||
# If there's any Swift dependencies on this framework rule, | ||
# look for providers to see if we need to generate Swift interfaces. | ||
if swift_support.uses_swift(deps[split_attr_key]): | ||
if split_attr_key in deps and swift_support.uses_swift(deps[split_attr_key]): | ||
uses_swift = True | ||
for dep in deps[split_attr_key]: | ||
if SwiftInfo in dep: | ||
|
@@ -864,6 +864,11 @@ built for those platform variants (for example, `x86_64`, `arm64`) as their valu | |
A dictionary of strings indicating which platform variants should be built for the tvOS platform ( | ||
`device` or `simulator`) as keys, and arrays of strings listing which architectures should be | ||
built for those platform variants (for example, `x86_64`, `arm64`) as their values. | ||
""", | ||
), | ||
"macos": attr.string_list( | ||
doc = """ | ||
A list of strings indicating which architecture should be built for the macOS platform (for example, `x86_64`, `arm64`). | ||
Comment on lines
+869
to
+871
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Keeping this a |
||
""", | ||
), | ||
"minimum_deployment_os_versions": attr.string_dict( | ||
|
@@ -1184,6 +1189,11 @@ Currently, this only affects processing of `ios` resources. | |
A dictionary of strings indicating which platform variants should be built for the `ios` platform ( | ||
`device` or `simulator`) as keys, and arrays of strings listing which architectures should be | ||
built for those platform variants (for example, `x86_64`, `arm64`) as their values. | ||
""", | ||
), | ||
"macos": attr.string_list( | ||
doc = """ | ||
A list of strings indicating which architecture should be built for the macOS platform (for example, `x86_64`, `arm64`). | ||
""", | ||
), | ||
"minimum_deployment_os_versions": attr.string_dict( | ||
|
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
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
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.
@keith @brentleyjones this fixes an issue introduced by adding the
macos
attr toapple_static_xcframework
:How should we properly fix this? Is the
apple_rule_arm64_as_arm64e_transition
being applied here for some reason?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.
This still leaves us with:
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.
AFAICT adding
macos
changes the transitions to addarm64e
, maybe this is related to #2419 as well since that's a split deps issue as well.