Skip to content

Commit 1ed50ce

Browse files
committed
Update toolchain
Signed-off-by: hi-rustin <[email protected]>
1 parent f9c6c6a commit 1ed50ce

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

ci/docker/android/Dockerfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
FROM rust-android
22

3-
ENV PATH=$PATH:/android/ndk/arm-21/bin:/android/ndk/arm64-21/bin:/android/ndk/x86-21/bin:/android/ndk/x86_64-21/bin \
4-
CC_arm_linux_androideabi=arm-linux-androideabi-clang \
5-
CC_armv7_linux_androideabi=arm-linux-androideabi-clang \
6-
CC_aarch64_linux_android=aarch64-linux-android-clang \
7-
CC_i686_linux_android=i686-linux-android-clang \
8-
CC_x86_64_linux_android=x86_64-linux-android-clang \
9-
CXX_arm_linux_androideabi=arm-linux-androideabi-clang++ \
10-
CXX_armv7_linux_androideabi=arm-linux-androideabi-clang++ \
11-
CXX_aarch64_linux_android=aarch64-linux-android-clang++ \
12-
CXX_i686_linux_android=i686-linux-android-clang++ \
13-
CXX_x86_64_linux_android=x86_64-linux-android-clang++ \
14-
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-clang \
15-
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-clang \
16-
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-clang \
17-
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-clang \
18-
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-clang
3+
ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin \
4+
CC_arm_linux_androideabi=armv7a-linux-androideabi19-clang \
5+
CC_armv7_linux_androideabi=armv7a-linux-androideabi19-clang \
6+
CC_aarch64_linux_android=aarch64-linux-android21-clang \
7+
CC_i686_linux_android=i686-linux-android19-clang \
8+
CC_x86_64_linux_android=x86_64-linux-android21-clang \
9+
CXX_arm_linux_androideabi=armv7a-linux-androideabi19-clang++ \
10+
CXX_armv7_linux_androideabi=armv7a-linux-androideabi19-clang++ \
11+
CXX_aarch64_linux_android=aarch64-linux-android21-clang++ \
12+
CXX_i686_linux_android=i686-linux-android19-clang++ \
13+
CXX_x86_64_linux_android=x86_64-linux-android21-clang++ \
14+
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \
15+
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \
16+
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang \
17+
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android19-clang \
18+
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang

0 commit comments

Comments
 (0)