Refactor swiftSDKAdditionalCustomProperties into SwiftSDKAdditionalContext struct#1270
Merged
Merged
Conversation
jakepetroules
requested review from
aciidgh,
mhrawdon,
neonichu and
owenv
as code owners
April 2, 2026 08:08
Collaborator
Author
|
@swift-ci test |
owenv
approved these changes
Apr 2, 2026
jakepetroules
force-pushed
the
eng/PR-android
branch
from
April 2, 2026 18:02
4e56ee8 to
7b1a654
Compare
Collaborator
Author
|
@swift-ci test |
finagolfin
reviewed
Apr 2, 2026
jakepetroules
force-pushed
the
eng/PR-android
branch
from
April 3, 2026 08:42
7b1a654 to
3b7f71a
Compare
Collaborator
Author
|
OK, this latest push successfully builds swift-rule-engine and swift-foundation. |
Collaborator
Author
|
@swift-ci test |
jakepetroules
force-pushed
the
eng/PR-android
branch
from
April 3, 2026 09:37
3b7f71a to
9613954
Compare
Collaborator
Author
|
@swift-ci test |
jakepetroules
force-pushed
the
eng/PR-android
branch
from
April 3, 2026 18:16
9613954 to
9512b1c
Compare
Collaborator
Author
|
@swift-ci test |
owenv
approved these changes
Apr 3, 2026
owenv
left a comment
owenv
left a comment
Collaborator
There was a problem hiding this comment.
Reapproving the updated changes with the clang resource dir fix
jakepetroules
force-pushed
the
eng/PR-android
branch
from
April 3, 2026 19:35
9512b1c to
ad39ce1
Compare
Collaborator
Author
|
@swift-ci test |
…ntext struct Rename swiftSDKAdditionalCustomProperties to swiftSDKAdditionalContext and have it return an optional SwiftSDKAdditionalContext struct that carries additionalCustomProperties along with new overrideSdkRoot and overrideToolsetAbsolutePaths fields. This allows platform extensions to provide SDK root and toolset overrides through the same mechanism, moving Android-specific hacks out of SDKRegistry and into the Android plugin. This also removes unnecessary and incorrectly ordered search paths for Android, and adds a new hack to override -sdk to point at the NDK, which fixes a warning and also causes the correct clang search paths to be found, like we do on Windows.
jakepetroules
force-pushed
the
eng/PR-android
branch
from
April 3, 2026 22:13
ad39ce1 to
2ef01e0
Compare
Collaborator
Author
|
@swift-ci test |
github-project-automation
Bot
moved this from In Progress
to Done
in SwiftPM on SwiftBuild
Member
|
@jakepetroules, @kateinoigakukun, and @MaxDesiatov, all linux trunk snapshot toolchain CI are failing today because of a wasm SwiftPM integration test, and this pull seems like the most likely candidate for that issue, just letting you guys know. |
Member
|
Never mind, seems fixed by #1281 instead. |
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
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.
Rename swiftSDKAdditionalCustomProperties to swiftSDKAdditionalContext and have it return an optional SwiftSDKAdditionalContext struct that carries additionalCustomProperties along with new overrideSdkRoot and overrideToolsetAbsolutePaths fields. This allows platform extensions to provide SDK root and toolset overrides through the same mechanism, moving Android-specific hacks out of SDKRegistry and into the Android plugin.
This also removes unnecessary and incorrectly ordered search paths for Android, and adds a new hack to override -sdk to point at the NDK, which fixes a warning and also causes the correct clang search paths to be found, like we do on Windows.
Closes swiftlang/swift#88282