Skip to content

Use Bionic module from new Android overlay in Swift 6 instead#326

Merged
FranzBusch merged 1 commit into
apple:mainfrom
finagolfin:droid
Aug 7, 2024
Merged

Use Bionic module from new Android overlay in Swift 6 instead#326
FranzBusch merged 1 commit into
apple:mainfrom
finagolfin:droid

Conversation

@finagolfin

Copy link
Copy Markdown
Contributor

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.

The new module and overlay were merged into Swift 6 in swiftlang/swift#74758.
return nil
}
#elseif canImport(Glibc) || canImport(Musl)
#elseif (canImport(Glibc) && !os(Android)) || canImport(Musl)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@FranzBusch

Copy link
Copy Markdown
Member

@swift-ci please test

@FranzBusch FranzBusch merged commit 2503842 into apple:main Aug 7, 2024
@finagolfin finagolfin deleted the droid branch August 7, 2024 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants