Skip to content

Supplemental: Android fixes for the Supplemental Runtimes #83382

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 3 commits into from
Jul 29, 2025

Conversation

compnerd
Copy link
Member

This corrects two issues in the runtimes build which are preventative towards use of the builds:

  1. We did not attach the interface include directory as a workaround for CMake not setting up the include path for the Swift module
  2. Correcting the builds of the runtime libraries to use the proper swiftAndroid module to get the Swift overlay rather than just the clang module.

Together, these changes enable building the C++ Interop libraries for Android with the new support.

compnerd added 3 commits July 28, 2025 17:27
Setup the interface include directory that seems to not be setup
implicitly by CMake as it should be. This workaround is necessary to
ensure that we are able to build against this module.
Clean up whitespace to match style.
This fixes up the Android builds to properly link against the right
modules. With this we properly propagate the necessary flags to build
the runtimes without colliding with existing builds.
@compnerd
Copy link
Member Author

@swift-ci please smoke test

@compnerd compnerd enabled auto-merge July 29, 2025 00:30
@compnerd
Copy link
Member Author

@swift-ci please smoke test macOS platform

@compnerd compnerd merged commit bccc22f into swiftlang:main Jul 29, 2025
3 checks passed
@compnerd compnerd deleted the android-linkage branch July 29, 2025 08:38
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.

1 participant