Use prebuilt linkers

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
rust-lang · Nov 3, 2022 · 08a8e2c · 08a8e2c
1 parent 98a97b3
commit 08a8e2c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 35 deletions.
diff --git a/ci/android-install-ndk.sh b/ci/android-install-ndk.sh
@@ -6,36 +6,6 @@ NDK=android-ndk-r21d
 wget --tries=20 -q https://dl.google.com/android/repository/${NDK}-linux-x86_64.zip
 unzip -q ${NDK}-linux-x86_64.zip
 
-case "$1" in
-  arm)
-    arch=arm
-    api=28
-    ;;
-  armv7)
-    arch=arm
-    api=28
-    ;;
-  aarch64)
-    arch=arm64
-    api=28
-    ;;
-  i686)
-    arch=x86
-    api=28
-    ;;
-  x86_64)
-    arch=x86_64
-    api=28
-    ;;
-  *)
-    echo "invalid arch: $1"
-    exit 1
-    ;;
-esac;
-
-python3 ${NDK}/build/tools/make_standalone_toolchain.py \
-        --install-dir "/android/ndk-${1}" \
-        --arch "${arch}" \
-        --api ${api}
+mv "${NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/" "/android/ndk-${1}/"
 
 rm -rf ./${NDK}-linux-x86_64.zip ./${NDK}
diff --git a/ci/docker/arm-linux-androideabi/Dockerfile b/ci/docker/arm-linux-androideabi/Dockerfile
@@ -28,9 +28,9 @@ RUN chmod 777 -R /tmp/.android
 RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
-    CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
+    CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi28-clang \
     CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=/tmp/runtest \
-    CC_arm_linux_androideabi=arm-linux-androideabi-gcc \
+    CC_arm_linux_androideabi=armv7a-linux-androideabi28-clang \
     HOME=/tmp
 
 ADD runtest-android.rs /tmp/runtest.rs

diff --git a/ci/docker/i686-linux-android/Dockerfile b/ci/docker/i686-linux-android/Dockerfile
@@ -28,9 +28,9 @@ RUN chmod 777 -R /tmp/.android
 RUN chmod 755 /android/sdk/cmdline-tools/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
-    CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
+    CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android28-clang \
     CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=/tmp/runtest \
-    CC_i686_linux_android=i686-linux-android-gcc \
+    CC_i686_linux_android=i686-linux-android28-clang \
     HOME=/tmp
 
 ADD runtest-android.rs /tmp/runtest.rs