Skip to content

[stdlib] fix android build #79523

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
Feb 24, 2025
Merged

Conversation

hjyamauchi
Copy link
Contributor

@hjyamauchi hjyamauchi commented Feb 20, 2025

ptrauth isn't available when stdlib is built with NDK's clang (Android NDK's clang doesn't support ptrauth and needs this guard)

Cherrypick commit #78208

ptrauth isn't available when stdlib is built with NDK's clang

Cherrypick commit swiftlang#78208
@hjyamauchi
Copy link
Contributor Author

@swift-ci please test

1 similar comment
@hjyamauchi
Copy link
Contributor Author

@swift-ci please test

@hjyamauchi hjyamauchi marked this pull request as ready for review February 21, 2025 16:52
@hjyamauchi hjyamauchi requested a review from a team as a code owner February 21, 2025 16:52
@hjyamauchi
Copy link
Contributor Author

Explanation: This fixes an Android build error in the release/6.1 branch on Windows due to the lack of ptrauth.h in the dev environment.
Scope: release/6.1.
Issues: No issue.
Original PRs: #78208
Risk: Low. A compiler feature check around a ptrauth header is safe.
Testing: Local builds with Android component build enabled. The 6.1 CI.
Reviewers: @compnerd

@compnerd compnerd added the 🍒 release cherry pick Flag: Release branch cherry picks label Feb 21, 2025
@hjyamauchi
Copy link
Contributor Author

CC @DougGregor

Copy link
Member

@DougGregor DougGregor left a comment

Choose a reason for hiding this comment

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

LGTM, thank you

@hjyamauchi hjyamauchi merged commit 08af019 into swiftlang:release/6.1 Feb 24, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 release cherry pick Flag: Release branch cherry picks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants