Build qemu earlier in Dockerfile.

Author: Alexhuszagh

docker/Dockerfile.aarch64-linux-android

@@ -10,6 +10,9 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
+COPY qemu.sh /
+RUN /qemu.sh aarch64
+
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
@@ -21,9 +24,6 @@ ENV PATH=$PATH:/android-ndk/bin
 COPY android-system.sh /
 RUN /android-system.sh arm64
 
-COPY qemu.sh /
-RUN /qemu.sh aarch64
-
 RUN cp /android-ndk/sysroot/usr/lib/aarch64-linux-android/$ANDROID_SDK/libz.so /system/lib/
 
 COPY android-runner /

docker/Dockerfile.arm-linux-androideabi

@@ -10,6 +10,9 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
+COPY qemu.sh /
+RUN /qemu.sh arm
+
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
@@ -21,9 +24,6 @@ ENV PATH=$PATH:/android-ndk/bin
 COPY android-system.sh /
 RUN /android-system.sh arm
 
-COPY qemu.sh /
-RUN /qemu.sh arm
-
 RUN cp /android-ndk/sysroot/usr/lib/arm-linux-androideabi/$ANDROID_SDK/libz.so /system/lib/
 
 COPY android-runner /

docker/Dockerfile.armv7-linux-androideabi

@@ -10,6 +10,9 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
+COPY qemu.sh /
+RUN /qemu.sh arm
+
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
@@ -21,9 +24,6 @@ ENV PATH=$PATH:/android-ndk/bin
 COPY android-system.sh /
 RUN /android-system.sh arm
 
-COPY qemu.sh /
-RUN /qemu.sh arm
-
 RUN cp /android-ndk/sysroot/usr/lib/arm-linux-androideabi/$ANDROID_SDK/libz.so /system/lib/
 
 COPY android-runner /

docker/Dockerfile.i686-linux-android

@@ -10,6 +10,17 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
+# We could supposedly directly run i686 binaries like we do for x86_64, but
+# doing so generates an assertion failure:
+#   ... assertion failed: signal(libc::SIGPIPE, libc::SIG_IGN) != libc::SIG_ERR
+#   ... src/libstd/sys/unix/mod.rs
+#   fatal runtime error: failed to initiate panic, error 5
+#
+# Running with qemu works as expected. it also ensures that're we're
+# running on a CPU common 32-bit x86 systems.
+COPY qemu.sh /
+RUN /qemu.sh i386
+
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
@@ -21,16 +32,6 @@ ENV PATH=$PATH:/android-ndk/bin
 COPY android-system.sh /
 RUN /android-system.sh x86
 
-# We could supposedly directly run i686 binaries like we do for x86_64, but
-# doing so generates an assertion failure:
-#   ... assertion failed: signal(libc::SIGPIPE, libc::SIG_IGN) != libc::SIG_ERR
-#   ... src/libstd/sys/unix/mod.rs
-#   fatal runtime error: failed to initiate panic, error 5
-#
-# Running with qemu works as expected
-COPY qemu.sh /
-RUN /qemu.sh i386
-
 RUN cp /android-ndk/sysroot/usr/lib/i686-linux-android/$ANDROID_SDK/libz.so /system/lib/
 
 COPY android-runner /

docker/Dockerfile.thumbv7neon-linux-androideabi

@@ -10,6 +10,9 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
+COPY qemu.sh /
+RUN /qemu.sh arm
+
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
@@ -21,9 +24,6 @@ ENV PATH=$PATH:/android-ndk/bin
 COPY android-system.sh /
 RUN /android-system.sh arm
 
-COPY qemu.sh /
-RUN /qemu.sh arm
-
 RUN cp /android-ndk/sysroot/usr/lib/arm-linux-androideabi/$ANDROID_SDK/libz.so /system/lib/
 
 COPY android-runner /

docker/Dockerfile.x86_64-linux-android

@@ -10,6 +10,10 @@ RUN /cmake.sh
 COPY xargo.sh /
 RUN /xargo.sh
 
+# Using qemu allows older host cpus (without sse4) to execute the target binaries
+COPY qemu.sh /
+RUN /qemu.sh x86_64
+
 ARG ANDROID_NDK=r21d
 ARG ANDROID_SDK=28
 ARG ANDROID_VERSION=9.0.0_r1
@@ -21,10 +25,6 @@ ENV PATH=$PATH:/android-ndk/bin
 COPY android-system.sh /
 RUN /android-system.sh x86_64
 
-# Using qemu allows older host cpus (without sse4) to execute the target binaries
-COPY qemu.sh /
-RUN /qemu.sh x86_64
-
 RUN cp /android-ndk/sysroot/usr/lib/x86_64-linux-android/$ANDROID_SDK/libz.so /system/lib/
 
 COPY android-runner /