From 85c79a21e15f86c364457cc843aec4395df0fcdb Mon Sep 17 00:00:00 2001
From: Mark <>
Date: Sun, 8 Dec 2024 22:14:27 +0100
Subject: [PATCH] android aarch64 build might work now

---
 musicdb-server/Cargo.toml |  4 ++++
 musicdb-server/Cross.toml | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/musicdb-server/Cargo.toml b/musicdb-server/Cargo.toml
index e5b2ffa..cc62921 100644
--- a/musicdb-server/Cargo.toml
+++ b/musicdb-server/Cargo.toml
@@ -15,6 +15,10 @@ tokio = { version = "1.37.0", optional = true, features = ["rt"] }
 rocket = { version = "0.5.0", optional = true }
 html-escape = { version = "0.2.13", optional = true }
 
+[target.aarch64-linux-android.dependencies]
+# required for cross-compilation to android to work: link to shared c++ stdlib instead of c++_static
+oboe-sys = { version = "*", features = ["shared-stdcxx"] }
+
 [features]
 default = ["website", "default-playback"]
 website = ["dep:tokio", "dep:rocket", "dep:html-escape"]
diff --git a/musicdb-server/Cross.toml b/musicdb-server/Cross.toml
index d222800..4804295 100644
--- a/musicdb-server/Cross.toml
+++ b/musicdb-server/Cross.toml
@@ -1,6 +1,17 @@
+# compile for aarch64 linux
 [build]
 pre-build = [
     "dpkg --add-architecture $CROSS_DEB_ARCH",
     "apt-get update && apt-get --assume-yes install libasound2-dev libasound2-dev:$CROSS_DEB_ARCH"
-]                 
+]
 default-target = "aarch64-unknown-linux-gnu"
+
+# # compile for aarch64 android
+# [build]
+# pre-build = [
+#     "dpkg --add-architecture $CROSS_DEB_ARCH",
+#     "dpkg --add-architecture i386",
+#     "apt-get update",
+#     "apt-get install --assume-yes libstdc++6:i386 libgcc1:i386 zlib1g:i386 libncurses5:i386",
+# ]
+# default-target = "aarch64-linux-android"