iOS/Android Support

Add steps for Android

PR comments

Author: ospfranco

.gitignore

@@ -9,3 +9,7 @@ libsql-sqlite3/**.o.tmp
 /libsql-ffi/bundled/SQLite3MultipleCiphers/build/**
 # will be copied from bundled/src
 /libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c
+
+/bindings/c/generated
+/bindings/c/**.xcframework
+/bindings/**/.DS_Store

bindings/c/Cargo.toml

@@ -13,6 +13,16 @@ cbindgen = "0.24.0"
 [dependencies]
 bytes = "1.5.0"
 lazy_static = "1.4.0"
-libsql = { path = "../../libsql", features = ["encryption"] }
 tokio = { version = "1.29.1", features = [ "rt-multi-thread" ] }
 hyper-rustls = { version = "0.25", features = ["webpki-roots"]}
+
+[target.'cfg(not(any(target_os = "ios", target_os = "android")))'.dependencies]
+libsql = { path = "../../libsql", features = ["encryption"] }
+
+# Disable encryption for ios and android targets
+[target.'cfg(any(target_os = "ios", target_os = "android"))'.dependencies]
+libsql = { path = "../../libsql"}
+
+
+[profile.release]
+strip = "symbols"

bindings/c/Makefile

@@ -1,6 +1,11 @@
 OS := $(shell uname)
 CFLAGS := -Iinclude
 LDFLAGS := -lm
+ARCHS_IOS = x86_64-apple-ios aarch64-apple-ios aarch64-apple-ios-sim
+ARCHS_ANDROID = aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
+LIB = libsql_experimental.a
+HEADER = libsql.h
+XCFRAMEWORK = libsql.xcframework
 
 # Set LIBSQL_PATH to the default path if not provided
 LIBSQL_EXPERIMENTAL_PATH ?= ../../target/release/libsql_experimental.a
@@ -9,8 +14,37 @@ ifeq ($(OS),Darwin)
 	CFLAGS += -framework Security -framework CoreServices
 endif
 
-.PHONY: all
+.PHONY: all $(ARCHS_IOS) ios $(ARCHS_ANDROID) android
+
 all: example
 
 example: example.c
 	$(CC) -o $@ $(CFLAGS) $< $(LIBSQL_EXPERIMENTAL_PATH) $(LDFLAGS)
+
+android: $(ARCHS_ANDROID)
+	rm -rf generated
+	mkdir -p generated/jniLibs
+	mkdir -p generated/jniLibs/arm64-v8a
+	mkdir -p generated/jniLibs/armeabi-v7a
+	mkdir -p generated/jniLibs/x86_64
+	mkdir -p generated/jniLibs/x86
+
+	cp ../../target/aarch64-linux-android/release/$(LIB) generated/jniLibs/arm64-v8a/$(LIB)
+	cp ../../target/armv7-linux-androideabi/release/$(LIB) generated/jniLibs/armeabi-v7a/$(LIB)
+	cp ../../target/x86_64-linux-android/release/$(LIB) generated/jniLibs/x86_64/$(LIB)
+	cp ../../target/i686-linux-android/release/$(LIB) generated/jniLibs/x86/$(LIB)
+
+$(ARCHS_ANDROID): %: 
+	cargo ndk --target $@ --platform 31 build --release
+
+ios: $(XCFRAMEWORK)
+
+$(ARCHS_IOS): %:
+	cargo build --release --target $@
+
+$(XCFRAMEWORK): $(ARCHS_IOS)
+	rm -rf generated
+	mkdir -p generated/simulator_fat
+	rm -rf $@
+	lipo -create $(wildcard ../../target/x86_64-apple-ios/release/$(LIB)) $(wildcard ../../target/aarch64-apple-ios-sim/release/$(LIB)) -output generated/simulator_fat/$(LIB)
+	xcodebuild -create-xcframework -library $(wildcard ../../target/aarch64-apple-ios/release/$(LIB)) -headers include -library generated/simulator_fat/$(LIB) -headers include -output $@

libsql-ffi/build.rs

@@ -312,6 +312,24 @@ fn build_multiple_ciphers(out_path: &Path) {
         .open(toolchain_path.clone())
         .unwrap();
 
+    if target.contains("x86_64-apple-ios") {
+        cmake_opts.push(&cmake_toolchain_opt);
+        writeln!(toolchain_file, "set(CMAKE_SYSTEM_NAME \"iOS\")").unwrap();
+        writeln!(toolchain_file, "set(CMAKE_SYSTEM_PROCESSOR \"x86_64\")").unwrap();
+    }
+
+    if target.contains("aarch64-apple-ios-sim") {
+        cmake_opts.push(&cmake_toolchain_opt);
+        writeln!(toolchain_file, "set(CMAKE_SYSTEM_NAME \"Darwin\")").unwrap();
+        writeln!(toolchain_file, "set(CMAKE_SYSTEM_PROCESSOR \"arm64\")").unwrap();
+    }
+
+    if target.contains("aarch64-apple-ios") {
+        cmake_opts.push(&cmake_toolchain_opt);
+        writeln!(toolchain_file, "set(CMAKE_SYSTEM_NAME \"iOS\")").unwrap();
+        writeln!(toolchain_file, "set(CMAKE_SYSTEM_PROCESSOR \"arm64\")").unwrap();
+    }
+
     if let Some(ref cc) = cc {
         let cc = cc.clone().into_string().unwrap();
         if cc.contains("aarch64") && cc.contains("linux") {

rust-toolchain.toml

@@ -1,3 +1,4 @@
 [toolchain]
 profile = "default"
 channel = "1.78.0"
+targets = ["x86_64-apple-ios", "aarch64-apple-ios", "aarch64-apple-ios-sim", "aarch64-linux-android", "armv7-linux-androideabi", "x86_64-linux-android", "i686-linux-android"]