Skip to content

Commit 81acd5e

Browse files
committed
chore(git): add android cargo build
1 parent c4a12eb commit 81acd5e

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,19 +125,19 @@ RUN . /root/.android_env
125125
# Debug: Verify the NDK files exist
126126
RUN echo "=== NDK DEBUG ==="
127127
RUN ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/ | head -10
128-
RUN ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang || echo "Linker not found!"
128+
RUN ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android22-clang || echo "Linker not found!"
129129
RUN ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar || echo "AR not found!"
130130

131131
# Test that our NDK linker works
132-
RUN ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang --version || echo "Cannot run clang!"
132+
RUN ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android22-clang --version || echo "Cannot run clang!"
133133

134134
# Test simple compilation with proper linker
135135
RUN echo 'fn main() {}' > test.rs
136136

137137
# Test compilation with explicit linker (this should work now)
138138
RUN rustc --target aarch64-linux-android --edition 2021 test.rs \
139139
--sysroot $(rustc --print sysroot) \
140-
-C linker=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android33-clang
140+
-C linker=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android22-clang
141141

142142
RUN echo "Test compilation successful!"
143143

0 commit comments

Comments
 (0)