Fix Android targets for CMake.

Author: Alexhuszagh

docker/Dockerfile.aarch64-linux-android

@@ -37,7 +37,7 @@ ENV CROSS_ANDROID_SDK=$ANDROID_SDK
 ENV CROSS_ANDROID_ARCH=aarch64
 ENV CROSS_ANDROID_TARGET=aarch64-linux-android
 COPY android-symlink.sh /
-RUN /android-symlink.sh $CROSS_ANDROID_ARCH $CROSS_ANDROID_TARGET
+RUN /android-symlink.sh aarch64 $CROSS_ANDROID_TARGET
 
 COPY android-runner /
 
@@ -47,7 +47,7 @@ ENV CMAKE_TOOLCHAIN_FILE=/opt/android.cmake
 # Libz is distributed in the android ndk, but for some unknown reason it is not
 # found in the build process of some crates, so we explicit set the DEP_Z_ROOT
 ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$CROSS_ANDROID_TARGET-gcc" \
-    CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER="/android-runner $CROSS_ANDROID_ARCH" \
+    CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER="/android-runner aarch64" \
     AR_aarch64_linux_android="$CROSS_ANDROID_TARGET-ar" \
     AS_aarch64_linux_android="$CROSS_ANDROID_TARGET-as" \
     CC_aarch64_linux_android="$CROSS_ANDROID_TARGET-gcc" \

docker/Dockerfile.arm-linux-androideabi

@@ -34,10 +34,10 @@ RUN /android-system.sh arm
 
 ENV CROSS_SYSROOT=/android-ndk/sysroot
 ENV CROSS_ANDROID_SDK=$ANDROID_SDK
-ENV CROSS_ANDROID_ARCH=arm
+ENV CROSS_ANDROID_ARCH=armv5te
 ENV CROSS_ANDROID_TARGET=arm-linux-androideabi
 COPY android-symlink.sh /
-RUN /android-symlink.sh $CROSS_ANDROID_ARCH $CROSS_ANDROID_TARGET
+RUN /android-symlink.sh arm $CROSS_ANDROID_TARGET
 
 COPY android-runner /
 
@@ -47,7 +47,7 @@ ENV CMAKE_TOOLCHAIN_FILE=/opt/android.cmake
 # Libz is distributed in the android ndk, but for some unknown reason it is not
 # found in the build process of some crates, so we explicit set the DEP_Z_ROOT
 ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER="$CROSS_ANDROID_TARGET-gcc" \
-    CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER="/android-runner $CROSS_ANDROID_ARCH" \
+    CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER="/android-runner arm" \
     AR_arm_linux_androideabi="$CROSS_ANDROID_TARGET-ar" \
     AS_arm_linux_androideabi="$CROSS_ANDROID_TARGET-as" \
     CC_arm_linux_androideabi="$CROSS_ANDROID_TARGET-gcc" \

docker/Dockerfile.armv7-linux-androideabi

@@ -34,10 +34,10 @@ RUN /android-system.sh arm
 
 ENV CROSS_SYSROOT=/android-ndk/sysroot
 ENV CROSS_ANDROID_SDK=$ANDROID_SDK
-ENV CROSS_ANDROID_ARCH=arm
+ENV CROSS_ANDROID_ARCH=armv7-a
 ENV CROSS_ANDROID_TARGET=arm-linux-androideabi
 COPY android-symlink.sh /
-RUN /android-symlink.sh $CROSS_ANDROID_ARCH $CROSS_ANDROID_TARGET
+RUN /android-symlink.sh arm $CROSS_ANDROID_TARGET
 
 COPY android-runner /
 
@@ -47,7 +47,7 @@ ENV CMAKE_TOOLCHAIN_FILE=/opt/android.cmake
 # Libz is distributed in the android ndk, but for some unknown reason it is not
 # found in the build process of some crates, so we explicit set the DEP_Z_ROOT
 ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="$CROSS_ANDROID_TARGET-gcc" \
-    CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_RUNNER="/android-runner $CROSS_ANDROID_ARCH" \
+    CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_RUNNER="/android-runner arm" \
     AR_armv7_linux_androideabi="$CROSS_ANDROID_TARGET-ar" \
     AS_armv7_linux_androideabi="$CROSS_ANDROID_TARGET-as" \
     CC_armv7_linux_androideabi="$CROSS_ANDROID_TARGET-gcc" \

docker/Dockerfile.i686-linux-android

@@ -55,7 +55,7 @@ ENV CMAKE_TOOLCHAIN_FILE=/opt/android.cmake
 # Libz is distributed in the android ndk, but for some unknown reason it is not
 # found in the build process of some crates, so we explicit set the DEP_Z_ROOT
 ENV CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$CROSS_ANDROID_TARGET-gcc" \
-    CARGO_TARGET_I686_LINUX_ANDROID_RUNNER="/android-runner $CROSS_ANDROID_ARCH" \
+    CARGO_TARGET_I686_LINUX_ANDROID_RUNNER="/android-runner i686" \
     AR_i686_linux_android="$CROSS_ANDROID_TARGET-ar" \
     AS_i686_linux_android="$CROSS_ANDROID_TARGET-as" \
     CC_i686_linux_android="$CROSS_ANDROID_TARGET-gcc" \

docker/Dockerfile.thumbv7neon-linux-androideabi

@@ -34,10 +34,10 @@ RUN /android-system.sh arm
 
 ENV CROSS_SYSROOT=/android-ndk/sysroot
 ENV CROSS_ANDROID_SDK=$ANDROID_SDK
-ENV CROSS_ANDROID_ARCH=arm
+ENV CROSS_ANDROID_ARCH=armv7-a
 ENV CROSS_ANDROID_TARGET=arm-linux-androideabi
 COPY android-symlink.sh /
-RUN /android-symlink.sh $CROSS_ANDROID_ARCH $CROSS_ANDROID_TARGET
+RUN /android-symlink.sh arm $CROSS_ANDROID_TARGET
 
 COPY android-runner /
 
@@ -50,7 +50,7 @@ ENV CMAKE_TOOLCHAIN_FILE=/opt/android.cmake
 # which we don't have, so just export every possible variable, such as AR.
 # Also export all target binutils just in case required.
 ENV CARGO_TARGET_THUMBV7NEON_LINUX_ANDROIDEABI_LINKER="$CROSS_ANDROID_TARGET-gcc" \
-    CARGO_TARGET_THUMBV7NEON_LINUX_ANDROIDEABI_RUNNER="/android-runner $CROSS_ANDROID_ARCH" \
+    CARGO_TARGET_THUMBV7NEON_LINUX_ANDROIDEABI_RUNNER="/android-runner arm" \
     AR_thumbv7neon_linux_androideabi="$CROSS_ANDROID_TARGET-ar" \
     AS_thumbv7neon_linux_androideabi="$CROSS_ANDROID_TARGET-as" \
     CC_thumbv7neon_linux_androideabi="$CROSS_ANDROID_TARGET-gcc" \

docker/Dockerfile.x86_64-linux-android

@@ -38,7 +38,7 @@ ENV CROSS_ANDROID_SDK=$ANDROID_SDK
 ENV CROSS_ANDROID_ARCH=x86_64
 ENV CROSS_ANDROID_TARGET=x86_64-linux-android
 COPY android-symlink.sh /
-RUN /android-symlink.sh $CROSS_ANDROID_ARCH $CROSS_ANDROID_TARGET
+RUN /android-symlink.sh x86_64 $CROSS_ANDROID_TARGET
 
 COPY android-runner /
 
@@ -48,7 +48,7 @@ ENV CMAKE_TOOLCHAIN_FILE=/opt/android.cmake
 # Libz is distributed in the android ndk, but for some unknown reason it is not
 # found in the build process of some crates, so we explicit set the DEP_Z_ROOT
 ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$CROSS_ANDROID_TARGET-gcc" \
-    CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="/android-runner $CROSS_ANDROID_ARCH" \
+    CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="/android-runner x86_64" \
     AR_x86_64_linux_android="$CROSS_ANDROID_TARGET-ar" \
     AS_x86_64_linux_android="$CROSS_ANDROID_TARGET-as" \
     CC_x86_64_linux_android="$CROSS_ANDROID_TARGET-gcc" \