Revert "Update CI to use Android NDK r25b" #104628
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
This reverts commit bf7f1ca.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) soon. Please see the contribution instructions for more information. |
rustbot
added
T-bootstrap
Mark-Simulacrum
added
beta-nominated
|
Thanks for preparing the beta commit. I'll pick that up into the beta backport rollup tomorrow (implicitly beta accepting this revert per #103673 (comment) and it being a revert). |
Mark-Simulacrum
added
the
beta-accepted
Mark-Simulacrum
removed
the
beta-nominated
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 20, 2022
…mulacrum [beta] backport * Use nominal_obligations_without_const in wf for FnDef rust-lang#104180 * Don't silently eat label before block in block-like expr rust-lang#103986 * Revert "Update CI to use Android NDK r25b" rust-lang#104628 * rustdoc: Resolve doc links in external traits having local impls rust-lang#104364 * Use 64 bits for incremental cache in-file positions rust-lang#104164 * rustdoc: Do not add external traits to the crate in register_res rust-lang#103649 * Revert "Normalize opaques with escaping bound vars" rust-lang#103509 * Bump to released stable compiler * [beta] Update cargo rust-lang#104486 r? `@Mark-Simulacrum`
CI will ensure the change works for the other uses of @bors r+ rollup=iffy |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 21, 2022
…rade, r=pietroalbini Revert "Update CI to use Android NDK r25b" This reverts commit bf7f1ca (pull request rust-lang#102332). The relevant discussion can be found in rust-lang#103673, where it was agreed that more time is needed to warn the community of the upcoming breakage. This PR is for the `master` branch, where a conflict was recently introduced due to 6d81602. The conflict is in `cc_detect.rs`, where the code that corrects the target triple was moved to a new function called `ndk_compiler()`. This puts the old logic in the `ndk_compiler` function, and assumes that it works properly in the other location where that code is being called. I would appreciate review from `@pietroalbini` to understand how we can test that the reverted logic is also suitable for the additional use case (seems to be related to setting `cc` and `cxx`). I've confirmed already that with these changes I can compile for `armv7-linux-androideabi`, `aarch64-linux-android`, `i686-linux-android`, and `x86_64-linux-android` using `x.py`. A separate revert for the `beta` branch will be required, since the original change has already made it to beta. The beta revert is available at alex-pinkus@3fa0d94, but I'm not sure of the process for staging that PR.
This was referenced Nov 21, 2022
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 21, 2022
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#104420 (Fix doc example for `wrapping_abs`) - rust-lang#104499 (rustdoc JSON: Use `Function` everywhere and remove `Method`) - rust-lang#104500 (`rustc_ast`: remove `ref` patterns) - rust-lang#104511 (Mark functions created for `raw-dylib` on x86 with DllImport storage class) - rust-lang#104595 (Add `PolyExistentialPredicate` type alias) - rust-lang#104605 (deduplicate constant evaluation in cranelift backend) - rust-lang#104628 (Revert "Update CI to use Android NDK r25b") - rust-lang#104662 (Streamline deriving on packed structs.) - rust-lang#104667 (Revert formatting changes of a test) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
gendx
added a commit
to gendx/android-rust-library
that referenced
this pull request
Jan 5, 2023
This is necessary since upstream reverted compatibility to NDK <= 22: rust-lang/rust#104628. See the discussion at rust-lang/rust#103673.
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.
This reverts commit bf7f1ca (pull request #102332).
The relevant discussion can be found in #103673, where it was agreed that more time is needed to warn the community of the upcoming breakage.
This PR is for the
masterbranch, where a conflict was recently introduced due to 6d81602. The conflict is incc_detect.rs, where the code that corrects the target triple was moved to a new function calledndk_compiler(). This puts the old logic in thendk_compilerfunction, and assumes that it works properly in the other location where that code is being called. I would appreciate review from @pietroalbini to understand how we can test that the reverted logic is also suitable for the additional use case (seems to be related to settingccandcxx). I've confirmed already that with these changes I can compile forarmv7-linux-androideabi,aarch64-linux-android,i686-linux-android, andx86_64-linux-androidusingx.py.A separate revert for the
betabranch will be required, since the original change has already made it to beta. The beta revert is available at alex-pinkus@3fa0d94, but I'm not sure of the process for staging that PR.