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

Import new Android overlay #651

Merged
merged 1 commit into from
Jul 16, 2024
Merged

Import new Android overlay #651

merged 1 commit into from
Jul 16, 2024

Conversation

finagolfin
Copy link
Contributor

This new overlay was recently added to trunk in swiftlang/swift#72161 and swiftlang/swift#72634, then to 6.0 in swiftlang/swift#74758. I've been building it with this patch on my daily Android CI since the trunk addition, finagolfin/swift-android-sdk#151, and natively on Android too.

@natecook1000, an easy review.

@rauhul
Copy link
Contributor

rauhul commented Jul 4, 2024

@swift-ci test

@finagolfin
Copy link
Contributor Author

I will check if Bionic can be used here instead and let you know.

@finagolfin
Copy link
Contributor Author

Alright, I checked and symbols imported in this file, like STDOUT_FILENO from unistd.h, are not available from the Bionic module that Swift uses, so this pull is ready for merging.

@finagolfin
Copy link
Contributor Author

@natecook1000, ready for merge.

@finagolfin
Copy link
Contributor Author

Rebased and fixed the merge conflict, one more CI run and this can go in.

@rauhul
Copy link
Contributor

rauhul commented Jul 16, 2024

@swift-ci test

@natecook1000 natecook1000 merged commit 4a2e245 into apple:main Jul 16, 2024
2 checks passed
@finagolfin finagolfin deleted the import branch July 17, 2024 08:56
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.

3 participants