Skip to content

[android] Don't generate a libstdcxx.modulemap #58497

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

Merged
merged 1 commit into from
Apr 29, 2022

Conversation

finagolfin
Copy link
Member

Android uses libc++, which already has its own module map.

@egorzhdan, as we discussed, removing this, as I noticed it breaks some tests on the Android CI too.

@compnerd, letting you know in case you have any input.

Android uses libc++, which already has its own module map.
Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Seems reasonable to get the CI back to green, but please do open an issue and tag it - we really should try to get C++ interop working on Android as well.

@finagolfin
Copy link
Member Author

please do open an issue and tag it

Will open an issue, but could you explain what I should do to "tag it?"

we really should try to get C++ interop working on Android as well.

It mostly works, with the Android CI only broken because some new Interop tests were added late last year that happen to interact badly with how Android organizes its C headers. Also, my pull #40779 that moved some Swift memory tags broke one test on the CI. Once this is in, I'll look at those remaining failing tests.

@compnerd
Copy link
Member

please do open an issue and tag it

Will open an issue, but could you explain what I should do to "tag it?"

Oh, just reference the issue in the commit message ideally (e.g. this should be enabled and #... tracks it type of thing) or just reference the PR from the issue.

we really should try to get C++ interop working on Android as well.

It mostly works, with the Android CI only broken because some new Interop tests were added late last year that happen to interact badly with how Android organizes its C headers. Also, my pull #40779 that moved some Swift memory tags broke one test on the CI. Once this is in, I'll look at those remaining failing tests.

Thank you!

Copy link
Contributor

@egorzhdan egorzhdan left a comment

Choose a reason for hiding this comment

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

Thanks!

@finagolfin
Copy link
Member Author

@egorzhdan, if you would just run the CI, we can get this in.

@egorzhdan
Copy link
Contributor

@swift-ci please smoke test

@egorzhdan egorzhdan merged commit e10ed0c into swiftlang:main Apr 29, 2022
@finagolfin finagolfin deleted the cxx branch May 1, 2022 05:25
@finagolfin
Copy link
Member Author

Thanks for the quick turnaround.

3405691582 added a commit to 3405691582/swift that referenced this pull request May 13, 2022
Therefore, do not generate a libstdcxx.modulemap. See also swiftlang#58497.
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