-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Revert "Update CI to use Android NDK r25b" #104628
Conversation
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. |
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). |
…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 |
…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.
…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
This is necessary since upstream reverted compatibility to NDK <= 22: rust-lang/rust#104628. See the discussion at rust-lang/rust#103673.
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
master
branch, 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_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 settingcc
andcxx
). I've confirmed already that with these changes I can compile forarmv7-linux-androideabi
,aarch64-linux-android
,i686-linux-android
, andx86_64-linux-android
usingx.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.