From fcc5fc5bb9f40fc236d85243e6bdfd4510db14bb Mon Sep 17 00:00:00 2001
From: mslxl <i@mslxl.com>
Date: Fri, 31 Oct 2025 18:51:25 +0800
Subject: [PATCH] fix(cli): skip checks ndk when NDK_HOME set

---
 crates/tauri-cli/src/mobile/android/mod.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/crates/tauri-cli/src/mobile/android/mod.rs b/crates/tauri-cli/src/mobile/android/mod.rs
index 1990cf2f4065..733522e8b59b 100644
--- a/crates/tauri-cli/src/mobile/android/mod.rs
+++ b/crates/tauri-cli/src/mobile/android/mod.rs
@@ -352,6 +352,20 @@ fn ensure_sdk(non_interactive: bool) -> Result<()> {
 }
 
 fn ensure_ndk(non_interactive: bool) -> Result<()> {
+
+  // Return Ok if NDK_HOME is set by user and its path exists
+  if let Some(ndk_home) = std::env::var_os("NDK_HOME").map(PathBuf::from) {
+    if ndk_home.exists() {
+      log::info!("Using NDK from NDK_HOME: {}", ndk_home.display());
+      return Ok(());
+    } else {
+      crate::error::bail!(
+        "NDK_HOME is set to {}, but the path does not exist.",
+        ndk_home.display()
+      );
+    }
+  }
+
   // re-evaluate ANDROID_HOME
   let android_home = std::env::var_os("ANDROID_HOME")
     .map(PathBuf::from)