Skip to content

Commit f9aab89

Browse files
committed
chore(git): add android cargo build
1 parent b3d10a2 commit f9aab89

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

Dockerfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV ANDROID_API_LEVEL="22"
55
ENV ANDROID_NDK_VERSION=r26d
66
ENV ANDROID_SDK_ROOT="/usr/lib/android-sdk"
77
ENV ANDROID_HOME="/usr/lib/android-sdk"
8-
ENV ANDROID_NDK_HOME="${ANDROID_SDK_ROOT}/ndk-bundle"
8+
ENV ANDROID_NDK_HOME="${ANDROID_SDK_ROOT}/ndk/22.1.7171670"
99
ENV ANDROID_NDK_PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin"
1010
ENV NDK_SYSROOT="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot"
1111

@@ -36,7 +36,7 @@ RUN mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/latest && \
3636
ENV PATH="${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin"
3737

3838
# Install Android platform, build tools, and NDK
39-
RUN yes | sdkmanager --licenses --sdk_root=${ANDROID_SDK_ROOT}
39+
RUN yes | sdkmanager "ndk;22.1.7171670" --licenses --sdk_root=${ANDROID_SDK_ROOT}
4040
RUN sdkmanager "platforms;android-${ANDROID_API_LEVEL}" "build-tools;${ANDROID_API_LEVEL}.0.0" "ndk-bundle" "cmake;3.22.1" \
4141
--sdk_root=${ANDROID_SDK_ROOT}
4242

@@ -83,12 +83,6 @@ RUN echo "=== SETTING UP CARGO CONFIG ===" && \
8383
echo '' >> /root/.cargo/config.toml && \
8484
cat /root/.cargo/config.toml
8585

86-
# Configure Rust to abort on panic (no libunwind needed)
87-
RUN echo '[profile.dev]' >> /root/.cargo/config.toml && \
88-
echo 'panic = "abort"' >> /root/.cargo/config.toml && \
89-
echo '' >> /root/.cargo/config.toml && \
90-
echo '[profile.release]' >> /root/.cargo/config.toml && \
91-
echo 'panic = "abort"' >> /root/.cargo/config.toml
9286

9387
# Test with Cargo
9488
RUN echo "=== TESTING WITH CARGO ===" && \

0 commit comments

Comments
 (0)