npiesco · npiesco · Jan 2, 2026 · Dec 1, 2025 · Dec 1, 2025 · Dec 1, 2025
diff --git a/README.md b/README.md
@@ -850,6 +850,51 @@ await db.close();
 
 **Setup:** See [**absurder-sql-mobile/README.md**](absurder-sql-mobile/README.md) for build instructions.
 
+#### Mobile Development Environment Setup
+
+Building mobile apps requires native toolchains and Rust cross-compilation targets. Follow these steps to set up your development environment:
+
+**Prerequisites:**
+- **Rust 1.85.0+** with iOS/Android targets
+- **Xcode** (iOS) with Command Line Tools
+- **Android Studio** (Android) with NDK
+
+**1. Install Rust iOS targets:**
+```bash
+rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
+```
+
+**2. Build iOS bindings with UniFFI:**
+```bash
+cd absurder-sql-mobile
+npx uniffi-bindgen-react-native build ios --and-generate
+```
+
+**3. Install CocoaPods dependencies:**
+```bash
+cd your-react-native-app/ios && pod install && cd ..
+```
+
+**4. Run on iOS Simulator:**
+```bash
+npx react-native run-ios --simulator="iPhone 16"
+```
+
+**Android Setup:**
+```bash
+# Install Rust Android targets
+rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
+
+# Build Android bindings
+cd absurder-sql-mobile
+npx uniffi-bindgen-react-native build android --and-generate
+
+# Run on Android Emulator
+cd your-react-native-app && npx react-native run-android
+```
+
+> **Important:** The `uniffi-bindgen-react-native build` step compiles the Rust native library for the target platform and generates the TypeScript/Swift/Kotlin bindings. This must be run before `pod install` (iOS) or Gradle build (Android).
+
 ## Performance Features
 
 AbsurderSQL includes several performance optimizations for high-throughput applications:

diff --git a/absurder-sql-mobile/AbsurderSqlMobileFramework.xcframework/Info.plist b/absurder-sql-mobile/AbsurderSqlMobileFramework.xcframework/Info.plist
@@ -8,7 +8,7 @@
 			<key>BinaryPath</key>
 			<string>libabsurder_sql_mobile.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libabsurder_sql_mobile.a</string>
 			<key>SupportedArchitectures</key>
@@ -17,12 +17,14 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libabsurder_sql_mobile.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libabsurder_sql_mobile.a</string>
 			<key>SupportedArchitectures</key>
@@ -31,8 +33,6 @@
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/absurder-sql-mobile/README.md b/absurder-sql-mobile/README.md
@@ -119,7 +119,7 @@ android/src/main/jni/sqlcipher-libs/
 1. **OpenSSL 1.1.1w** (for each ABI):
 ```bash
 # Example for arm64-v8a
-export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/27.1.12297006
+export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/29.0.14206865
 cd /tmp && tar xzf openssl-1.1.1w.tar.gz && cd openssl-1.1.1w
 
 ./Configure android-arm64 \
@@ -272,11 +272,20 @@ encryption-ios = ["encryption-commoncrypto"]  # Alias for convenience
 - iOS Simulator or device
 
 **For Android:**
-- Android Studio
-- Android NDK 27.1.12297006 (or compatible)
+- Android Studio (with bundled JDK 21)
+- Android NDK (installed via SDK Manager)
 - Android SDK with API 23+
+- cargo-ndk v3.5.4 (`cargo install cargo-ndk --version 3.5.4`)
 - Emulator or device
 
+**Environment Variables (add to `~/.zshrc`):**
+```bash
+export ANDROID_HOME=$HOME/Library/Android/sdk
+export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/29.0.14206865
+export JAVA_HOME="/Applications/Android Studio.app/Contents/jbr/Contents/Home"
+export PATH=$JAVA_HOME/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator:$PATH
+```
+
 ### Rust Targets
 
 Install all required targets:
@@ -319,30 +328,26 @@ The `npm run ubrn:ios` script:
 
 #### Android Build
 
+**Prerequisites:** SQLCipher static libraries must be built first. See "Building SQLCipher for Android" below.
+
 ```bash
 cd absurder-sql-mobile
 
-# Build Rust + generate UniFFI bindings + fix RN 0.82 compatibility
+# Build Rust + generate UniFFI bindings
 npm run ubrn:android
 
-# Bundle React Native app and build APK
-cd react-native
-npx react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res
-cd android && ./gradlew assembleDebug
-
-# Install to emulator/device
-adb install -r app/build/outputs/apk/debug/app-debug.apk
-adb shell am start -n com.absurdersqltestapp/.MainActivity
+# Run on emulator (from vault app directory)
+cd ../vault/mobile
+npx react-native run-android
 ```
 
 The `npm run ubrn:android` script:
-- Builds Rust for all 4 Android ABIs (arm64-v8a, armeabi-v7a, x86, x86_64)
+- Builds Rust for configured Android ABIs (currently arm64-v8a)
 - Generates Kotlin bindings via UniFFI
 - Copies `.a` libraries to `jniLibs/`
 - Generates TypeScript bindings
-- **Runs `scripts/fix_cpp_adapter.py`** to fix React Native 0.82 compatibility issues
 
-**Critical:** The `fix_cpp_adapter.py` script replaces UniFFI's generated `cpp-adapter.cpp` with a React Native 0.82-compatible version. This step is required because UniFFI generates code that's incompatible with RN 0.82's `CallInvokerHolder` API.
+**Note:** The `ubrn.config.yaml` controls which ABIs are built. Currently only `arm64-v8a` is enabled since SQLCipher libs are only built for that ABI.
 
 ### Important: Clean Build Environments
 
@@ -355,6 +360,60 @@ printenv | grep -E "CC|ANDROID|NDK|CLANG|AR_|RANLIB"
 # Should return nothing - if polluted, start new terminal
 ```
 
+### Building SQLCipher for Android
+
+SQLCipher static libraries must be built once per ABI. Currently only `arm64-v8a` is built.
+
+**1. Build OpenSSL 1.1.1w:**
+```bash
+export ANDROID_NDK_HOME=$HOME/Library/Android/sdk/ndk/29.0.14206865
+export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/bin:$PATH
+
+cd /tmp
+curl -LO https://www.openssl.org/source/openssl-1.1.1w.tar.gz
+tar xzf openssl-1.1.1w.tar.gz && cd openssl-1.1.1w
+
+./Configure android-arm64 -D__ANDROID_API__=23 no-shared no-asm -fPIC --prefix=/tmp/openssl-arm64-v8a
+make -j8 && make install_sw
+```
+
+**2. Build SQLCipher 4.6.0:**
+```bash
+export TOOLCHAIN=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64
+export CC="$TOOLCHAIN/bin/clang --target=aarch64-linux-android23"
+export AR=$TOOLCHAIN/bin/llvm-ar
+export RANLIB=$TOOLCHAIN/bin/llvm-ranlib
+
+cd /tmp
+curl -LO https://github.com/sqlcipher/sqlcipher/archive/refs/tags/v4.6.0.tar.gz
+tar xzf v4.6.0.tar.gz && cd sqlcipher-4.6.0
+
+./configure --host=aarch64-linux-android --with-crypto-lib=openssl --enable-tempstore=yes --disable-tcl \
+  CFLAGS="-D__ANDROID_API__=23 -DSQLITE_HAS_CODEC -fPIC -I/tmp/openssl-arm64-v8a/include" \
+  CPPFLAGS="-I/tmp/openssl-arm64-v8a/include" \
+  LDFLAGS="-L/tmp/openssl-arm64-v8a/lib" \
+  LIBS="-lcrypto -lssl"
+
+make -j8
+$TOOLCHAIN/bin/llvm-ar rcs .libs/libsqlcipher.a .libs/sqlite3.o
+```
+
+**3. Copy libs to project:**
+```bash
+mkdir -p android/src/main/jni/sqlcipher-libs/arm64-v8a
+cp /tmp/sqlcipher-4.6.0/.libs/libsqlcipher.a android/src/main/jni/sqlcipher-libs/arm64-v8a/
+cp /tmp/openssl-arm64-v8a/lib/libcrypto.a android/src/main/jni/sqlcipher-libs/arm64-v8a/
+cp /tmp/openssl-arm64-v8a/lib/libssl.a android/src/main/jni/sqlcipher-libs/arm64-v8a/
+```
+
+### cargo-ndk Version
+
+**Critical:** Must use cargo-ndk v3.5.4. Version 4.x has breaking changes with `--no-strip` flag that uniffi-bindgen-react-native uses.
+
+```bash
+cargo install cargo-ndk --version 3.5.4
+```
+
 ---
 
 ## API Reference

diff --git a/absurder-sql-mobile/android/build.gradle b/absurder-sql-mobile/android/build.gradle
@@ -79,7 +79,7 @@ android {
       }
     }
     ndk {
-      abiFilters "arm64-v8a", "armeabi-v7a", "x86", "x86_64"
+      abiFilters "arm64-v8a"
     }
   }
 
@@ -103,6 +103,10 @@ android {
     disable "GradleCompatible"
   }
 
+  packagingOptions {
+    pickFirst '**/*.so'
+  }
+
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_8
     targetCompatibility JavaVersion.VERSION_1_8

diff --git a/absurder-sql-mobile/android/src/main/java/com/absurdersqlmobile/AbsurderSqlInitializer.kt b/absurder-sql-mobile/android/src/main/java/com/absurdersqlmobile/AbsurderSqlInitializer.kt
@@ -4,7 +4,7 @@ import com.facebook.react.bridge.*
 
 /**
  * Custom initialization module for AbsurderSQL on Android.
- * 
+ *
  * This module is NOT generated and will not be overwritten.
  * It provides platform-specific setup that must happen before
  * any database operations.
@@ -14,33 +14,26 @@ class AbsurderSqlInitializer(reactContext: ReactApplicationContext)
 
     override fun getName() = "AbsurderSqlInitializer"
 
-    // External JNI function defined in cpp-adapter.cpp
-    external fun nativeSetDataDirectory(path: String): Boolean
-
-    companion object {
-        init {
-            // Load the same native library as the main module
-            System.loadLibrary("absurder-sql")
-        }
-    }
-
     /**
-     * Initialize Android-specific paths for Rust database code.
-     * Must be called before any database operations.
+     * Get the app's files directory path for database storage.
+     * Returns the absolute path to the app's internal files directory.
      */
     @ReactMethod
-    fun initialize(promise: Promise) {
+    fun getDataDirectory(promise: Promise) {
         try {
             val filesDir = reactApplicationContext.filesDir.absolutePath
-            val success = nativeSetDataDirectory(filesDir)
-
-            if (success) {
-                promise.resolve(null)
-            } else {
-                promise.reject("INIT_ERROR", "Failed to set Android data directory")
-            }
+            promise.resolve(filesDir)
         } catch (e: Exception) {
-            promise.reject("INIT_ERROR", "Error during initialization: ${e.message}", e)
+            promise.reject("DIR_ERROR", "Failed to get data directory: ${e.message}", e)
         }
     }
+
+    /**
+     * Initialize is now a no-op since we handle path resolution in TypeScript.
+     * Kept for backwards compatibility.
+     */
+    @ReactMethod
+    fun initialize(promise: Promise) {
+        promise.resolve(null)
+    }
 }
diff --git a/absurder-sql-mobile/android/src/main/java/com/absurdersqlmobile/AbsurderSqlPackage.kt b/absurder-sql-mobile/android/src/main/java/com/absurdersqlmobile/AbsurderSqlPackage.kt
@@ -1,4 +1,4 @@
-// Generated by uniffi-bindgen-react-native
+// Custom modifications - DO NOT REGENERATE (added to noOverwrite in ubrn.config.yaml)
 package com.absurdersqlmobile
 
 import com.facebook.react.TurboReactPackage
@@ -9,11 +9,15 @@ import com.facebook.react.module.model.ReactModuleInfoProvider
 import java.util.HashMap
 
 class AbsurderSqlPackage : TurboReactPackage() {
+  companion object {
+    const val INITIALIZER_NAME = "AbsurderSqlInitializer"
+  }
+
   override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-    return if (name == AbsurderSqlModule.NAME) {
-      AbsurderSqlModule(reactContext)
-    } else {
-      null
+    return when (name) {
+      AbsurderSqlModule.NAME -> AbsurderSqlModule(reactContext)
+      INITIALIZER_NAME -> AbsurderSqlInitializer(reactContext)
+      else -> null
     }
   }
 
@@ -28,6 +32,15 @@ class AbsurderSqlPackage : TurboReactPackage() {
         false,  // isCxxModule
         true // isTurboModule
       )
+      // AbsurderSqlInitializer is a bridge module (not turbo module)
+      moduleInfos[INITIALIZER_NAME] = ReactModuleInfo(
+        INITIALIZER_NAME,
+        INITIALIZER_NAME,
+        false,  // canOverrideExistingModule
+        false,  // needsEagerInit
+        false,  // isCxxModule
+        false   // isTurboModule - this is a bridge module
+      )
       moduleInfos
     }
   }

diff --git a/absurder-sql-mobile/package.json b/absurder-sql-mobile/package.json
@@ -10,7 +10,7 @@
     "test": "jest",
     "prepare": "tsc",
     "ubrn:ios": "IPHONEOS_DEPLOYMENT_TARGET=13.0 ubrn build ios --and-generate",
-    "ubrn:android": "ubrn build android --and-generate && python3 scripts/fix_cpp_adapter.py",
+    "ubrn:android": "ubrn build android --and-generate",
     "ubrn:bindings": "ubrn generate --all-platforms",
     "ubrn:clean": "rm -rfv cpp/ android/generated/ ios/generated/ src/generated/",
     "fix:cpp-adapter": "python3 scripts/fix_cpp_adapter.py"
@@ -45,6 +45,9 @@
     "react": ">=17.0.0",
     "react-native": ">=0.64.0"
   },
+  "dependencies": {
+    "uniffi-bindgen-react-native": "^0.29.3-1"
+  },
   "devDependencies": {
     "@types/jest": "^29.5.0",
     "@types/react": "19.2.2",
@@ -53,8 +56,7 @@
     "react": "^19.2.0",
     "react-native": "^0.82.1",
     "ts-jest": "^29.1.0",
-    "typescript": "^5.0.0",
-    "uniffi-bindgen-react-native": "^0.29.3-1"
+    "typescript": "^5.0.0"
   },
   "files": [
     "lib/",

diff --git a/absurder-sql-mobile/react-native/.detoxrc.js b/absurder-sql-mobile/react-native/.detoxrc.js
@@ -13,12 +13,12 @@ module.exports = {
     'ios.debug': {
       type: 'ios.app',
       binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/AbsurderSQLTestApp.app',
-      build: 'xcodebuild -project ios/AbsurderSQLTestApp.xcodeproj -scheme AbsurderSQLTestApp -configuration Debug -sdk iphonesimulator -derivedDataPath ios/build'
+      build: 'xcodebuild -workspace ios/AbsurderSQLTestApp.xcworkspace -scheme AbsurderSQLTestApp -configuration Debug -sdk iphonesimulator -arch arm64 -derivedDataPath ios/build'
     },
     'ios.release': {
       type: 'ios.app',
       binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/AbsurderSQLTestApp.app',
-      build: 'xcodebuild -project ios/AbsurderSQLTestApp.xcodeproj -scheme AbsurderSQLTestApp -configuration Release -sdk iphonesimulator -derivedDataPath ios/build'
+      build: 'xcodebuild -workspace ios/AbsurderSQLTestApp.xcworkspace -scheme AbsurderSQLTestApp -configuration Release -sdk iphonesimulator -arch arm64 -derivedDataPath ios/build'
     },
     'android.debug': {
       type: 'android.apk',
@@ -38,7 +38,7 @@ module.exports = {
     simulator: {
       type: 'ios.simulator',
       device: {
-        type: 'iPhone 15'
+        type: 'iPhone 17 Pro'
       }
     },
     attached: {