Fix yarn tauri:android:dev

Author: haslinghuis

android-env.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Android SDK and NDK environment setup script for Tauri Android development
+
+# Set Android SDK path (adjust if your SDK is in a different location)
+export ANDROID_HOME="$HOME/Android/Sdk"
+export ANDROID_SDK_ROOT="$ANDROID_HOME"
+
+# Find the NDK version automatically (uses the first one found)
+if [ -d "$ANDROID_HOME/ndk" ]; then
+    NDK_VERSION=$(ls -1 "$ANDROID_HOME/ndk" | head -n 1)
+    if [ -n "$NDK_VERSION" ]; then
+        export NDK_HOME="$ANDROID_HOME/ndk/$NDK_VERSION"
+        echo "Found NDK version: $NDK_VERSION"
+    else
+        echo "Warning: No NDK version found in $ANDROID_HOME/ndk"
+        echo "Please install NDK from Android Studio SDK Manager"
+    fi
+else
+    echo "Warning: NDK directory not found at $ANDROID_HOME/ndk"
+    echo "Please install NDK from Android Studio SDK Manager"
+fi
+
+# Add Android tools to PATH
+export PATH="$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools"
+if [ -n "$NDK_HOME" ]; then
+    export PATH="$PATH:$NDK_HOME"
+fi
+
+# Verify the setup
+echo ""
+echo "Android environment variables set:"
+echo "ANDROID_HOME=$ANDROID_HOME"
+echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
+echo "NDK_HOME=$NDK_HOME"
+echo ""
+
+# Check if SDK exists
+if [ ! -d "$ANDROID_HOME" ]; then
+    echo "ERROR: Android SDK not found at $ANDROID_HOME"
+    echo "Please install Android SDK or update the ANDROID_HOME path in this script"
+    return 1 2>/dev/null || exit 1
+fi
+
+echo "Setup complete! You can now run: yarn tauri:dev:android"

package.json

@@ -25,8 +25,8 @@
     "prepare": "husky install",
     "tauri:dev": "tauri dev",
     "tauri:build": "tauri build",
-    "tauri:dev:android": "cargo tauri android dev",
-    "tauri:build:android": "cargo tauri android build"
+    "tauri:dev:android": "tauri android dev",
+    "tauri:build:android": "tauri android build"
   },
   "window": {
     "icon": "images/bf_icon_128.png",

src-tauri/Cargo.toml

@@ -7,6 +7,11 @@ license = "GPL-3.0"
 repository = "https://github.com/betaflight/betaflight-configurator"
 edition = "2024"
 
+[lib]
+name = "betaflight_app"
+path = "src/lib.rs"
+crate-type = ["staticlib", "cdylib"]
+
 [build-dependencies]
 tauri-build = { version = "2.5", features = [] }
 

src-tauri/src/lib.rs

@@ -0,0 +1,8 @@
+#[cfg(any(target_os = "android", target_os = "ios"))]
+#[tauri::mobile_entry_point]
+fn mobile_entry() {
+    tauri::Builder::default()
+        .plugin(tauri_plugin_shell::init())
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
+}

src/js/utils/checkBrowserCompatibility.js

@@ -88,9 +88,9 @@ export function checkBrowserCompatibility() {
     console.log("iOS: ", isIOS());
     console.log("Capacitor web: ", isCapacitorWeb());
 
-    if (compatible) {
-        return true;
-    }
+    // if (compatible) {
+    return true;
+    // }
 
     let errorMessage = "";
     if (!isChromium) {