Skip to content
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

[6.0] Import new Android overlay or Bionic module #1660

Merged
merged 1 commit into from
Aug 7, 2024

Conversation

finagolfin
Copy link
Member

Explanation: Now that this new overlay was merged into the 6.0 compiler too in swiftlang/swift#74758, this adds the overlay to the six files that currently import Glibc in this repo and fixes a build error because strsignal() always returns _Nonnull in the latest Android NDK 26.

Scope: Add imports and a build fix on Android only

Issue: None

Original PR: #1647

Risk: None

Testing: Passed all CI on trunk, plus now builds with the new Android overlay on my daily Android CI, finagolfin/swift-android-sdk#156

Reviewer: @compnerd

@artemcm, easy review.

Also, fix build error because `strsignal()` always returns `_Nonnull` in the
latest Android NDK 26.
@finagolfin
Copy link
Member Author

@bnbarham, need a CI run here, perhaps @nkcsgexi can review it too.

@bnbarham
Copy link
Contributor

@swift-ci please test

@finagolfin
Copy link
Member Author

Passed CI, ready for merge.

@finagolfin
Copy link
Member Author

Any further sign-off needed or this can be merged?

@finagolfin
Copy link
Member Author

Ping @artemcm, anybody else need to sign off on this being merged?

@finagolfin
Copy link
Member Author

@bnbarham, can you go ahead and merge?

@bnbarham bnbarham merged commit 9954e95 into swiftlang:release/6.0 Aug 7, 2024
3 checks passed
@finagolfin finagolfin deleted the release/6.0 branch August 8, 2024 05:22
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.

4 participants