Skip to content

[5.7][android] Update to LTS NDK 25b (#60938) #61297

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

Closed
wants to merge 1 commit into from

Conversation

finagolfin
Copy link
Member

@finagolfin finagolfin commented Sep 26, 2022

Cherrypick of 5.7-relevant portions of #60938 and single doc change from #61873

Explanation: Make it so that the Swift build detects the clang shipping in the Android NDK, rather than having to manually update SWIFT_ANDROID_NDK_CLANG_VERSION every time, by extracting the versioned resource directory from the NDK using file(GLOB).

Scope: Only affects cross-compiling for Android with the NDK

SR Issue: None

Risk: Essentially none, since it only affects Android

Testing: This patch got trunk compiling on the community Android CI again with the latest NDK 25b.

Reviewer: @DougGregor

This pull will keep 5.7 patch releases compiling with future NDK releases, rather than having to manually patch this repo with the new clang version each time. Since this pull is so low-risk, I thought it is worth getting in to 5.7.

@finagolfin finagolfin requested a review from a team as a code owner September 26, 2022 17:42
@finagolfin
Copy link
Member Author

Ping @DougGregor, please let me know if we can get this small pull in.

@finagolfin
Copy link
Member Author

Ping, now that 5.7.1 is out, would be good to get this in before 5.7.2.

@finagolfin
Copy link
Member Author

@shahmishal, could we get this small pull in?

Also, remove `SWIFT_ANDROID_NDK_CLANG_VERSION` and just extract the
resource directory from the NDK using `file(GLOB)`.
@airspeedswift
Copy link
Member

Always put a link to the original change in description of all PRs that pick to 5.7 (unless there's some exceptional reason why that doesn't apply, in which case explain why in the PR description)

@finagolfin
Copy link
Member Author

Always put a link to the original change in description of all PRs that pick to 5.7

@airspeedswift, done, guess I forgot this time.

@finagolfin
Copy link
Member Author

Ping, would like to get this in.

@finagolfin
Copy link
Member Author

Pinging @airspeedswift, can we get this small pull in for Android?

@finagolfin
Copy link
Member Author

@DougGregor, can we get this small Android pull in before the next patch release?

@finagolfin
Copy link
Member Author

@shahmishal, would like to get this small change in before the next patch release, or at least a decision made. It's a small tweak that only affects building the stdlib for Android, so I figured it's safe to get in.

@finagolfin
Copy link
Member Author

Closing since 5.8 was just released, which already has this pull.

@finagolfin finagolfin closed this Mar 30, 2023
@finagolfin finagolfin deleted the ndk branch March 30, 2023 23:06
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