Auto merge of #120593 - maurer:android-bump, r=Mark-Simulacrum

Update Android 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:

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

.github/workflows/ci.yml

@@ -204,7 +204,7 @@ jobs:
               - self-hosted
               - ARM64
               - linux
-          - name: arm-android
+          - name: aarch64-android
             os: ubuntu-20.04-8core-32gb
             env: {}
           - name: armhf-gnu

src/ci/docker/host-x86_64/arm-android/Dockerfile → src/ci/docker/host-x86_64/aarch64-android/Dockerfile

@@ -6,7 +6,7 @@ RUN sh /scripts/android-base-apt-get.sh
 
 COPY scripts/android-ndk.sh /scripts/
 RUN . /scripts/android-ndk.sh && \
-    download_ndk android-ndk-r25b-linux.zip
+    download_ndk android-ndk-r26b-linux.zip
 
 RUN dpkg --add-architecture i386 && \
     apt-get update && \
@@ -21,14 +21,14 @@ RUN dpkg --add-architecture i386 && \
 
 COPY scripts/android-sdk.sh /scripts/
 COPY scripts/android-sdk-manager.py /scripts/
-COPY host-x86_64/arm-android/android-sdk.lock /android/sdk/android-sdk.lock
+COPY host-x86_64/aarch64-android/android-sdk.lock /android/sdk/android-sdk.lock
 RUN /scripts/android-sdk.sh
 
 ENV PATH=$PATH:/android/sdk/emulator
 ENV PATH=$PATH:/android/sdk/tools
 ENV PATH=$PATH:/android/sdk/platform-tools
 
-ENV TARGETS=arm-linux-androideabi
+ENV TARGETS=arm-linux-androideabi,aarch64-linux-android
 
 ENV RUST_CONFIGURE_ARGS --android-ndk=/android/ndk/
 

src/ci/docker/host-x86_64/aarch64-android/android-sdk.lock

@@ -0,0 +1,6 @@
+emulator emulator-linux_x64-11237101.zip 0fd36dd5a7be6ee8770776a95c2933541d9243f3
+patcher;v4 3534162-studio.sdk-patcher.zip 046699c5e2716ae11d77e0bad814f7f33fab261e
+platform-tools platform-tools_r34.0.5-linux.zip 96097475cf7b279fdd8f218f5d043ffe94104ec3
+platforms;android-21 android-21_r02.zip 53536556059bb29ae82f414fd2e14bc335a4eb4c
+system-images;android-21;default;arm64-v8a sys-img/android/arm64-v8a-21_r04.zip c4375f1b4b4cd21a8617660e25f621cedcbd8332
+tools sdk-tools-linux-4333796.zip 8c7c28554a32318461802c1291d76fccfafde054

src/ci/docker/host-x86_64/dist-android/Dockerfile

@@ -6,7 +6,7 @@ RUN sh /scripts/android-base-apt-get.sh
 # ndk
 COPY scripts/android-ndk.sh /scripts/
 RUN . /scripts/android-ndk.sh && \
-    download_ndk android-ndk-r25b-linux.zip
+    download_ndk android-ndk-r26b-linux.zip
 
 # env
 ENV TARGETS=arm-linux-androideabi

src/ci/github-actions/ci.yml

@@ -381,7 +381,7 @@ jobs:
           - name: aarch64-gnu
             <<: *job-aarch64-linux
 
-          - name: arm-android
+          - name: aarch64-android
             <<: *job-linux-8c
 
           - name: armhf-gnu