Skip to content

Commit 296bf7c

Browse files
committed
use Android NDK r25 '25.1.8937393' version
change Rust toolchain version to the latest nightly, because the "-lunwind" problem has gone after upgrading the latest Android NDK The Rust team has made some changes to support new versions of Android NDK, so if I still use an old NDK, "-lunwind" problem appears. - rust-lang/rust#85806
1 parent 3bb5280 commit 296bf7c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ RUN mkdir sdk && \
2020
wget 'https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip' -O tools.zip && \
2121
unzip tools.zip && \
2222
yes | ./cmdline-tools/bin/sdkmanager --licenses --sdk_root=./sdk && \
23-
./cmdline-tools/bin/sdkmanager --sdk_root=./sdk --install ndk-bundle && \
23+
./cmdline-tools/bin/sdkmanager --sdk_root=./sdk --install 'ndk;25.1.8937393' && \
2424
./cmdline-tools/bin/sdkmanager --sdk_root=./sdk --install 'cmake;3.18.1'
2525

2626
WORKDIR /some-tools
2727
RUN git submodule update --init --recursive
28-
RUN echo 'sdk.dir=/sdk' > local.properties && \
28+
RUN (echo 'sdk.dir=/sdk'; echo 'ndk.dir=/sdk/ndk/25.1.8937393') > local.properties && \
2929
echo 'opensslLib.dir=/openssl' > config.properties && \
3030
echo 'ndk.target=armeabi-v7a-21,arm64-v8a-29,x86-29,x86_64-29' >> config.properties
3131

@@ -34,7 +34,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > install && \
3434
chmod +x install && \
3535
./install -y && \
3636
. ~/.cargo/env && \
37-
rustup default nightly-2022-09-20 && \
37+
rustup default nightly && \
3838
rustc --version && \
3939
./tools/configure-rust
4040

0 commit comments

Comments
 (0)