Use Bionic module from new Android overlay in Swift 6 instead #326
Conversation
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
The new module and overlay were merged into Swift 6 in swiftlang/swift#74758.
finagolfin
commented
Aug 6, 2024
| @@ -28,11 +30,16 @@ func start_thread(_ raw: UnsafeMutableRawPointer) -> UnsafeMutableRawPointer? { | |||
| Unmanaged<TaskDriver>.fromOpaque(raw).takeRetainedValue().run() | |||
| return nil | |||
| } | |||
| #elseif canImport(Glibc) || canImport(Musl) | |||
| #elseif (canImport(Glibc) && !os(Android)) || canImport(Musl) | |||
There was a problem hiding this comment.
These two changes get start_thread() working with Swift 5.10 and NDK 26 also, by changing the signature for the nullability annotations. That's why this is the only portion of this pull to check os(Android), because that's available in both Swift 5.10 and 6.
|
@swift-ci please test |
FranzBusch
approved these changes
Aug 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The new module and overlay were merged into Swift 6 in swiftlang/swift#74758.
I've been building and testing this package natively on Android for some time, but the addition of nullability annotations to Bionic with NDK 26 last year and the new Android overlay in the Swift compiler this summer required these changes.