Skip to content

Commit 956a528

Browse files
Use armv7 androideabi
1 parent 9f2419d commit 956a528

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
fail-fast: true
1919
with:
2020
target: x86_64-linux-android
21-
arm-linux-androideabi:
21+
armv7-linux-androideabi:
2222
uses: ./.github/workflows/run-ci-script.yml
2323
strategy:
2424
fail-fast: true
2525
with:
26-
target: arm-linux-androideabi
26+
target: armv7-linux-androideabi
2727
aarch64-unknown-linux-android-NEON:
2828
uses: ./.github/workflows/run-ci-script.yml
2929
strategy:

ci/docker/arm-linux-androideabi/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ RUN chmod 777 -R /tmp/.android
3131
RUN chmod 755 /android/sdk/*tools/**/* /android/sdk/emulator/qemu/linux-x86_64/*
3232

3333
ENV PATH=$PATH:/rust/bin \
34-
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi19-clang \
34+
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_LINKER=armv7a-linux-androideabi19-clang \
3535
CARGO_TARGET_ARM_LINUX_ANDROIDEABI_RUNNER=/tmp/runtest \
36-
OBJDUMP=arm-linux-androideabi-objdump \
36+
OBJDUMP=llvm-objdump \
3737
HOME=/tmp
3838

3939
ADD runtest-android.rs /tmp/runtest.rs

0 commit comments

Comments
 (0)