Using cmdline-tools in Arm Android Dockers

Author: workingjubilee

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/arm-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_ARM_LINUX_ANDROIDEABI_LINKER=arm-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 \