Update Android SDK

Use more recent cmdline-tools for Arm Android

Author: workingjubilee

ci/android-install-sdk.sh

@@ -18,9 +18,12 @@ set -ex
 # located in https://github.com/appunite/docker by just wrapping it in a script
 # which apparently magically accepts the licenses.
 
+ANDROID_SDK_URL=https://dl.google.com/android/repository
+ANDROID_SDK_ARCHIVE=commandlinetools-linux-9477386_latest.zip
+
 mkdir sdk
-curl --retry 5 https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip -O
-unzip -d sdk sdk-tools-linux-3859397.zip
+curl --retry 5 "$ANDROID_SDK_URL/$ANDROID_SDK_ARCHIVE" -O
+unzip -d sdk "$ANDROID_SDK_ARCHIVE"
 
 case "$1" in
   arm | armv7)
@@ -45,16 +48,22 @@ case "$1" in
     ;;
 esac;
 
+mv sdk/cmdline-tools latest
+mkdir sdk/cmdline-tools
+mv latest sdk/cmdline-tools
+
+ANDROID_SDK_BIN="./sdk/cmdline-tools/latest/bin"
+
 # --no_https avoids
      # javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found
-yes | ./sdk/tools/bin/sdkmanager --licenses --no_https
-yes | ./sdk/tools/bin/sdkmanager --no_https \
+yes | "$ANDROID_SDK_BIN/sdkmanager" --licenses --no_https
+yes | "$ANDROID_SDK_BIN/sdkmanager" --no_https \
         "emulator" \
         "platform-tools" \
         "platforms;android-24" \
         "system-images;android-24;default;$abi"
 
 echo "no" |
-    ./sdk/tools/bin/avdmanager create avd \
+    "$ANDROID_SDK_BIN/avdmanager" create avd \
         --name "${1}" \
         --package "system-images;android-24;default;$abi"

ci/docker/aarch64-linux-android/Dockerfile

@@ -24,11 +24,11 @@ ENV ANDROID_ARCH=aarch64
 RUN sh /android/android-install-ndk.sh
 ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
 RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
-ENV PATH=$PATH:/android/sdk/tools:/android/sdk/platform-tools
+ENV PATH=$PATH:/android/sdk/cmdline-tools:/android/sdk/platform-tools
 
 RUN mv /root/.android /tmp
 RUN chmod 777 -R /tmp/.android
-RUN chmod 755 /android/sdk/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
+RUN chmod 755 /android/sdk/*tools/**/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
     CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang \

ci/docker/armv7-linux-androideabi/Dockerfile

@@ -24,10 +24,11 @@ ENV ANDROID_ARCH=arm
 RUN sh /android/android-install-ndk.sh
 ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
 RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
-ENV PATH=$PATH:/android/sdk/tools:/android/sdk/platform-tools
+ENV PATH=$PATH:/android/sdk/cmdline-tools:/android/sdk/platform-tools
+
 RUN mv /root/.android /tmp
 RUN chmod 777 -R /tmp/.android
-RUN chmod 755 /android/sdk/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
+RUN chmod 755 /android/sdk/*tools/**/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
     CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \

ci/docker/thumbv7neon-linux-androideabi/Dockerfile

@@ -25,11 +25,11 @@ RUN sh /android/android-install-ndk.sh
 ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
 
 RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
-ENV PATH=$PATH:/android/sdk/tools:/android/sdk/platform-tools
+ENV PATH=$PATH:/android/sdk/cmdline-tools:/android/sdk/platform-tools
 
 RUN mv /root/.android /tmp
 RUN chmod 777 -R /tmp/.android
-RUN chmod 755 /android/sdk/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
+RUN chmod 755 /android/sdk/*tools/**/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
     CARGO_TARGET_THUMBV7NEON_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \