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

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

diff --git a/android-x86/Dockerfile b/android-x86/Dockerfile
index e1e57ec..c650dbc 100644
--- a/android-x86/Dockerfile
+++ b/android-x86/Dockerfile
@@ -29,6 +29,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 i686-linux-android
+COPY config.toml /root/.cargo/
+
+# Prepare CMake
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
 
diff --git a/android-x86/config.toml b/android-x86/config.toml
new file mode 100644
index 0000000..71fb996
--- /dev/null
+++ b/android-x86/config.toml
@@ -0,0 +1,5 @@
+[build]
+target = "i686-linux-android"
+
+[target.i686-linux-android]
+linker = "/usr/i686-linux-android/bin/i686-linux-android23-clang"