Skip to content

Commit 1b98e10

Browse files
committed
Update toolchain for android
Signed-off-by: hi-rustin <[email protected]>
1 parent 8176774 commit 1b98e10

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

ci/docker/android/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin \
1111
RANLIB_aarch64_linux_android=llvm-ranlib \
1212
RANLIB_i686_linux_android=llvm-ranlib \
1313
RANLIB_x86_64_linux_android=llvm-ranlib \
14-
CC_arm_linux_androideabi=armv7a-linux-androideabi19-clang \
15-
CC_armv7_linux_androideabi=armv7a-linux-androideabi19-clang \
14+
CC_arm_linux_androideabi=armv7a-linux-androideabi21-clang \
15+
CC_armv7_linux_androideabi=armv7a-linux-androideabi21-clang \
1616
CC_aarch64_linux_android=aarch64-linux-android21-clang \
17-
CC_i686_linux_android=i686-linux-android19-clang \
17+
CC_i686_linux_android=i686-linux-android21-clang \
1818
CC_x86_64_linux_android=x86_64-linux-android21-clang \
19-
CXX_arm_linux_androideabi=armv7a-linux-androideabi19-clang++ \
20-
CXX_armv7_linux_androideabi=armv7a-linux-androideabi19-clang++ \
19+
CXX_arm_linux_androideabi=armv7a-linux-androideabi21-clang++ \
20+
CXX_armv7_linux_androideabi=armv7a-linux-androideabi21-clang++ \
2121
CXX_aarch64_linux_android=aarch64-linux-android21-clang++ \
22-
CXX_i686_linux_android=i686-linux-android19-clang++ \
22+
CXX_i686_linux_android=i686-linux-android21-clang++ \
2323
CXX_x86_64_linux_android=x86_64-linux-android21-clang++ \
24-
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \
25-
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \
24+
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang \
25+
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang \
2626
CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang \
27-
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android19-clang \
27+
CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android21-clang \
2828
CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang

0 commit comments

Comments
 (0)