Bug fixes for non-aarch64 Android targets and minor enhancements.

Author: Alexhuszagh

docker/Dockerfile.arm-linux-androideabi

@@ -27,7 +27,9 @@ COPY android-ndk.sh /
 RUN /android-ndk.sh arm
 ENV PATH=$PATH:/android-ndk/bin
 
-COPY android-system.sh remove_android_tests.py /
+COPY android-system.sh /
+RUN mkdir -p $PYTHON_TMPDIR
+COPY android $PYTHON_TMPDIR
 RUN /android-system.sh arm
 
 ENV CROSS_SYSROOT=/android-ndk/sysroot

docker/Dockerfile.armv7-linux-androideabi

@@ -27,7 +27,9 @@ COPY android-ndk.sh /
 RUN /android-ndk.sh arm
 ENV PATH=$PATH:/android-ndk/bin
 
-COPY android-system.sh remove_android_tests.py /
+COPY android-system.sh /
+RUN mkdir -p $PYTHON_TMPDIR
+COPY android $PYTHON_TMPDIR
 RUN /android-system.sh arm
 
 ENV CROSS_SYSROOT=/android-ndk/sysroot

docker/Dockerfile.i686-linux-android

@@ -17,7 +17,7 @@ RUN /xargo.sh
 #   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.
+# running on a CPU that only supports 32-bit x86 systems.
 COPY qemu.sh /
 RUN /qemu.sh i386
 
@@ -35,7 +35,9 @@ COPY android-ndk.sh /
 RUN /android-ndk.sh x86
 ENV PATH=$PATH:/android-ndk/bin
 
-COPY android-system.sh remove_android_tests.py /
+COPY android-system.sh /
+RUN mkdir -p $PYTHON_TMPDIR
+COPY android $PYTHON_TMPDIR
 RUN /android-system.sh x86
 
 ENV CROSS_SYSROOT=/android-ndk/sysroot

docker/Dockerfile.thumbv7neon-linux-androideabi

@@ -27,7 +27,9 @@ COPY android-ndk.sh /
 RUN /android-ndk.sh arm
 ENV PATH=$PATH:/android-ndk/bin
 
-COPY android-system.sh remove_android_tests.py /
+COPY android-system.sh /
+RUN mkdir -p $PYTHON_TMPDIR
+COPY android $PYTHON_TMPDIR
 RUN /android-system.sh arm
 
 ENV CROSS_SYSROOT=/android-ndk/sysroot

docker/Dockerfile.x86_64-linux-android

@@ -28,7 +28,9 @@ COPY android-ndk.sh /
 RUN /android-ndk.sh x86_64
 ENV PATH=$PATH:/android-ndk/bin
 
-COPY android-system.sh remove_android_tests.py /
+COPY android-system.sh /
+RUN mkdir -p $PYTHON_TMPDIR
+COPY android $PYTHON_TMPDIR
 RUN /android-system.sh x86_64
 
 ENV CROSS_SYSROOT=/android-ndk/sysroot

docker/android-ndk.sh

@@ -9,11 +9,6 @@ set -euo pipefail
 main() {
     local arch="${1}"
 
-    if [[ "${ANDROID_SDK}" -eq 25 ]]; then
-        echo "Android SDK level 25 is not supported." 1>&2
-        exit 1
-    fi
-
     # python3 is still needed for newer NDK versions, just since it
     # simplifies making symlinks even though the toolchain is prebuilt
     install_packages curl python python3

docker/android-system.sh

@@ -19,8 +19,9 @@
 #   8.1: 27 (tested at NDK r21d, 8.1.0_r81)
 #   9.0: 28 (tested at NDK r21d and r25b, 9.0.0_r1)
 #   10.0: 29 (tested at NDK r25b, 10.0.0_r47)
-#   11.0: 30
-#   12.0: 31, 32
+#   11.0: 30 (tested at NDK r25b, 11.0.0_r48)
+#   12.0: 31 (unable to build at 12.0.0_r34)
+#   12.1: 32 (unable to build at 12.1.0_r27)
 #   13.0: 33
 #
 #   API level 25 seems to be missing from Android NDK versions,
@@ -128,6 +129,7 @@ main() {
     build_android
     install_android "${tools[@]}"
 
+    remove_java
     purge_packages
 
     popd
@@ -183,6 +185,12 @@ EOF
     touch /tmp/lib/tools.jar
 }
 
+remove_java() {
+    rm /usr/bin/java
+    rm /usr/bin/javac
+    rm /tmp/lib/tools.jar
+}
+
 build_android() {
     if [[ "${ANDROID_SYSTEM_COMPLETE}" != "1" ]]; then
         export ALLOW_MISSING_DEPENDENCIES=true

docker/android/pyproject.toml

@@ -2,7 +2,7 @@
 name = "android"
 version = "0.0.0-dev.0"
 license = { text = "MIT OR Apache-2.0" }
-dependencies = ["sly==0.4"]
+dependencies = ["sly==0.4", "google-re2==1.0"]
 
 [build-system]
 requires = [

docker/android/tox.ini

@@ -6,6 +6,7 @@ isolated_build = True
 [testenv]
 deps =
     sly >= 0.4
+    google-re2 >= 1.0
     pytest
     toml
 commands = pytest -o cache_dir={toxworkdir}/.pytest_cache