Skip to content

Commit e0a867f

Browse files
committed
upgrade ndk r25b to r26d
1 parent d4ecb09 commit e0a867f

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

ci/android-ndk.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set -ex
22

33
ANDROID_NDK_URL=https://dl.google.com/android/repository
4-
ANDROID_NDK_ARCHIVE=android-ndk-r25b-linux.zip
4+
ANDROID_NDK_ARCHIVE=android-ndk-r26d-linux.zip
55

66
mkdir /android-toolchain
77
cd /android-toolchain

ci/docker/arm-linux-androideabi/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ RUN /android-ndk.sh
1414
ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
1515

1616
# TODO: run tests in an emulator eventually
17-
ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \
17+
ENV CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang \
1818
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=echo

ci/docker/armv7-linux-androideabi/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ RUN /android-ndk.sh
1414
ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
1515

1616
# TODO: run tests in an emulator eventually
17-
ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \
17+
ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi21-clang \
1818
CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_RUNNER=echo

ci/docker/i686-linux-android/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ RUN /android-ndk.sh
1414
ENV PATH=$PATH:/android-toolchain/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
1515

1616
# TODO: run tests in an emulator eventually
17-
ENV CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android19-clang \
17+
ENV CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android21-clang \
1818
CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=echo

0 commit comments

Comments
 (0)