Update Android in CI #120593
Update Android in CI #120593
Conversation
|
r? @Kobzol (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
A-testsuite
|
Pietro, I've added you explicitly since you're the only one to ever touch this lockfile, which means you're likely to be the one who can run |
|
cc @chriswailes |
|
The new files should be uploaded to the mirror. However, I'd like to get a +1 from another android target maintainer on this PR before moving ahead. cc @chriswailes @mgeisler (per platform support docs) |
Mark-Simulacrum
added
S-waiting-on-author
|
Happy to see this land, as it looks like it will also allow simplifying away rust-lang/backtrace-rs#570 from backtrace-rs, too. |
|
ping @Mark-Simulacrum - it looks like it still says "waiting on author", but Chris has LGTM'd. |
|
@rustbot ready |
rustbot
added
S-waiting-on-review
|
@bors r+ rollup=iffy |
bors
added
S-waiting-on-bors
Update Android in CI We are currently using a 10+ year old Android image, and it has caused trouble when working on rust-lang#120326. Our current NDK (25) only supports API 19+, so we were already out of spec. This PR: 1. Bumps the API used by the emulator in CI to 21, as per [NDK-26's release notes](https://github.com/android/ndk/wiki/Changelog-r26) deprecating 19 and 20 as targets. 2. Activates aarch64 testing on the emulator, since the base image is now a 64-bit image. 3. Bumps the NDK to 26b
|
💔 Test failed - checks-actions |
bors
removed
the
S-waiting-on-bors
|
Seems like it is stuck at the same point, which appears to be just before "pushing server" based on logs from https://github.com/rust-lang-ci/rust/actions/runs/10101022677/job/27933675737. @maurer any ideas here? |
|
That would normally mean that the virtual device wasn't coming up, so it was hanging on connecting... but wasn't this working before? |
This comment has been minimized.
This comment has been minimized.
|
It did pass at https://github.com/rust-lang-ci/rust/actions/runs/10049405628/job/27775374879. The dropped patch 005ab82 ("Add aarch64-android testing") included a change to the arm dockerfile ENTRYPOINT, as well as android-start-emulator.sh - any chance that could be it? |
|
|
We were running testing on API 18, which was already out of support for NDK 25, and some of the ancient behavior in that image was causing trouble when developing `rustc` features (rust-lang#120326). Update to the current LTS NDK 26, and to its minimum supported API 21. Fixes: rust-lang#120567
|
@bors try |
Update Android in CI We are currently using a 10+ year old Android image, and it has caused trouble when working on rust-lang#120326. Our current NDK (25) only supports API 19+, so we were already out of spec. This PR: 1. Bumps the API used by the emulator in CI to 21, as per [NDK-26's release notes](https://github.com/android/ndk/wiki/Changelog-r26) deprecating 19 and 20 as targets. 2. Bumps the NDK to 26b try-job: arm-android
|
☀️ Try build successful - checks-actions |
|
Great, time for the real thing. Only change from the previous approval was to drop the patches that add aarch64. @bors r=Mark-Simulacrum,workingjubilee |
bors
added
S-waiting-on-bors
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Note that try builds cannot be cancelled using the current bors bot. |
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (6ef11b8): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. Max RSS (memory usage)This benchmark run did not return any relevant results for this metric. CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 772.066s -> 770.248s (-0.24%) |
|
Congratulations on getting this merged, it seems to have been incredibly difficult. Thanks for the persistence. |
Since rust-lang/rust#120593 the minimum android API level is 21. Related: https://github.com/android/ndk/wiki/Changelog-r26 rust-lang/rust#129305 1. stop setting `dl_iterate_phdr` based on whether the android API level is greater than or equal to 21, but retain it for back compat. 2. remove `cc` build dependency. 3. upgrade ndk r25b to r26d in CI.
We are currently using a 10+ year old Android image, and it has caused trouble when working on #120326.
Our current NDK (25) only supports API 19+, so we were already out of spec. This PR:
try-job: arm-android