[0.2] Backport android constants #3850
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @JohnTitor rustbot has assigned @JohnTitor. Use |
This comment was marked as outdated.
This comment was marked as outdated.
|
☔ The latest upstream changes (presumably #3851) made this pull request unmergeable. Please resolve the merge conflicts. |
tgross35
force-pushed
the
backport-android-constants
branch
2 times, most recently
from
c7ce9a9
to
58e8af5
Compare
(backport <rust-lang#3779>) [resolve conflicts - Trevor] (cherry picked from commit 93e531e)
(backport <rust-lang#3779>) (cherry picked from commit d22cc19)
tgross35
force-pushed
the
backport-android-constants
branch
from
58e8af5
to
6be814d
Compare
auto-merge was automatically disabled
August 20, 2024 11:41
Pull request was closed
Merged
via the queue into
rust-lang:libc-0.2
with commit Aug 20, 2024
f9aa12d
90 of 91 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #3779. Excludes the NDK upgrade.