Skip to content

Commit

Permalink
Merge #740
Browse files Browse the repository at this point in the history
740: Bug fix for armv7-linux-androideabi not having an android-runner. r=Emilgardis a=Alexhuszagh

Closes #738.

Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
  • Loading branch information
bors[bot] and Alexhuszagh authored Jun 1, 2022
2 parents 771ce9d + b168ccd commit 31875dc
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docker/Dockerfile.armv7-linux-androideabi
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ RUN /qemu.sh arm

RUN cp /android-ndk/sysroot/usr/lib/arm-linux-androideabi/28/libz.so /system/lib/

COPY android-runner /

# Libz is distributed in the android ndk, but for some unknown reason it is not
# found in the build process of some crates, so we explicit set the DEP_Z_ROOT
ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
Expand Down

0 comments on commit 31875dc

Please sign in to comment.