From e6619f6a221c8a1e9ca5fa9ec21d8b383ad4b5fb Mon Sep 17 00:00:00 2001
From: Jonas Vautherin <dev@jonas.vautherin.ch>
Date: Sat, 15 Feb 2025 22:29:27 +0100
Subject: [PATCH] Add rust support to android-arm

---
 android-arm/Dockerfile.in | 6 ++++++
 android-arm/config.toml   | 5 +++++
 2 files changed, 11 insertions(+)
 create mode 100644 android-arm/config.toml

diff --git a/android-arm/Dockerfile.in b/android-arm/Dockerfile.in
index 038554d..ff7e66a 100644
--- a/android-arm/Dockerfile.in
+++ b/android-arm/Dockerfile.in
@@ -35,6 +35,12 @@ RUN mkdir -p /build && \
     find ${CROSS_ROOT} -exec chmod a+r '{}' \; && \
     find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \;
 
+# Prepare Rust
+ENV PATH="/root/.cargo/bin/:$PATH"
+RUN rustup target add armv7-linux-androideabi
+COPY config.toml /root/.cargo/
+
+# Prepare CMake
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
 
diff --git a/android-arm/config.toml b/android-arm/config.toml
new file mode 100644
index 0000000..e8c101f
--- /dev/null
+++ b/android-arm/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "armv7-linux-androideabi"
+
+[target.armv7-linux-androideabi]
+linker = "/usr/arm-linux-androideabi/bin/armv7a-linux-androideabi23-clang"