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 (#477) #478

Merged
merged 1 commit into from
Jul 10, 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 files that currently import Glibc.

Scope: Add imports on Android only

Issue: None

Original PR: #477

Risk: None

Testing: Passed all CI on trunk, plus on my daily Android CI, finagolfin/swift-android-sdk#151

Reviewer: @bnbarham

@bnbarham
Copy link
Contributor

bnbarham commented Jul 8, 2024

Should these also be bionic?

@finagolfin
Copy link
Member Author

No, the one import had to be Android, as this library uses C functions that aren't in the current Bionic module, so I then checked canImport(Android) everywhere for consistency.

@bnbarham
Copy link
Contributor

bnbarham commented Jul 8, 2024

@swift-ci please test

@finagolfin
Copy link
Member Author

Passed CI, ready for merge.

@bnbarham bnbarham merged commit db56adf into swiftlang:release/6.0 Jul 10, 2024
3 checks passed
@finagolfin finagolfin deleted the release/6.0 branch July 10, 2024 00:51
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