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.

Sign up for GitHub

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

Jump to bottom

Add missing constants for Android #3779

Merged
merged 3 commits into from
Aug 16, 2024
Merged

Add missing constants for Android #3779

merged 3 commits into from
Aug 16, 2024

Conversation

yujincheng08
Copy link
Contributor

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Jul 20, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@yujincheng08 yujincheng08 mentioned this pull request Jul 20, 2024
Closed
@tgross35
Copy link
Contributor

@maurer would you mind taking a look at this?

@yujincheng08
Copy link
Contributor Author

r? @maurer

@rustbot
Copy link
Collaborator

rustbot commented Aug 12, 2024

Failed to set assignee to maurer: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

@maurer
Copy link

maurer commented Aug 12, 2024

This looks fine to me, the reason those constants were 64-bit only before was as a hacky form of version detection. However, now that our min API level is 21, we shouldn't need to worry about that, and making them available to 32-bit should be appropriate. The rest of this appears to be appropriate constant migration.

The only thing I'll note is that since this bumps the NDK to the latest stable (r27), we'll want to bump it in rustc as well before integrating this change there after it lands. (I don't think it'll be as troublesome as last time, but we'll have to do the whole song and dance with updating the mirror again.)

@yujincheng08
Copy link
Contributor Author

thanks @maurer

r? @tgross35 could you check if it's now okay to merge it?

@rustbot rustbot assigned tgross35 and unassigned JohnTitor Aug 13, 2024
@bors
Copy link
Contributor

bors commented Aug 14, 2024

☔ The latest upstream changes (presumably #3777) made this pull request unmergeable. Please resolve the merge conflicts.

@yujincheng08
Copy link
Contributor Author

@tgross35 hi, would you mind taking a look at this?

@tgross35
Copy link
Contributor

Please be patient with reviews, there are a lot of open PRs.

Relevant headers for comparison:

A few questions below then LGTM. Thanks Matthew for taking a look too.

@rustbot author

@yujincheng08
Copy link
Contributor Author

@rustbot ready

@yujincheng08
Copy link
Contributor Author

@rustbot author

@yujincheng08
Copy link
Contributor Author

@rustbot ready

@tgross35
Copy link
Contributor

Oh I only meant to start with the API added here for the risc-v file. But no harm of course :)

Please rebase to drop the merge commit, then looks good to me.

@yujincheng08
Copy link
Contributor Author

Rebased

tgross35
tgross35 approved these changes Aug 16, 2024
View reviewed changes
Copy link
Contributor

@tgross35 tgross35 left a comment

Choose a reason for hiding this comment

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

Thanks!

@tgross35 tgross35 changed the title Add missing constant for Android Add missing constants for Android Aug 16, 2024
@tgross35 tgross35 added this pull request to the merge queue Aug 16, 2024
Merged via the queue into rust-lang:main with commit 8583c71 Aug 16, 2024
39 checks passed
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Aug 16, 2024
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 17, 2024
@yujincheng08 @tgross35
Add missing constant for Android
73af7aa 
(backport <rust-lang#3779>)
(cherry picked from commit 93e531e)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 17, 2024
@yujincheng08 @tgross35
Add android-riscv64 API check
5286d80 
(backport <rust-lang#3779>)
(cherry picked from commit d22cc19)
@tgross35 tgross35 mentioned this pull request Aug 17, 2024
Merged
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 20, 2024
@yujincheng08 @tgross35
Add android-riscv64 API check
c7ce9a9 
(backport <rust-lang#3779>)
(cherry picked from commit d22cc19)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 20, 2024
@yujincheng08 @tgross35
Add android-riscv64 API check
58e8af5 
(backport <rust-lang#3779>)
[resolve conflicts - Trevor]
(cherry picked from commit d22cc19)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 20, 2024
@yujincheng08 @tgross35
Add missing constant for Android
c980c64 
(backport <rust-lang#3779>)
[resolve conflicts - Trevor]
(cherry picked from commit 93e531e)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 20, 2024
@yujincheng08 @tgross35
Add android-riscv64 API check
6be814d 
(backport <rust-lang#3779>)
(cherry picked from commit d22cc19)
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Aug 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juankyc juankyc juankyc approved these changes

@tgross35 tgross35 tgross35 approved these changes

Assignees

@tgross35 tgross35

Labels
S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@yujincheng08 @rustbot @tgross35 @maurer @bors @juankyc @JohnTitor