File tree Expand file tree Collapse file tree 1 file changed +4
-1
lines changed
crates/tauri-cli/src/mobile/android Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -246,7 +246,9 @@ fn ensure_java() -> Result<()> {
246246}
247247
248248fn ensure_sdk ( non_interactive : bool ) -> Result < ( ) > {
249- let android_home = std:: env:: var_os ( "ANDROID_HOME" ) . map ( PathBuf :: from) ;
249+ let android_home = std:: env:: var_os ( "ANDROID_HOME" )
250+ . map ( PathBuf :: from)
251+ . or_else ( || std:: env:: var_os ( "ANDROID_SDK_ROOT" ) . map ( PathBuf :: from) ) ;
250252 if !android_home. as_ref ( ) . is_some_and ( |v| v. exists ( ) ) {
251253 log:: info!(
252254 "ANDROID_HOME {}, trying to locate Android SDK..." ,
@@ -339,6 +341,7 @@ fn ensure_ndk(non_interactive: bool) -> Result<()> {
339341 // re-evaluate ANDROID_HOME
340342 let android_home = std:: env:: var_os ( "ANDROID_HOME" )
341343 . map ( PathBuf :: from)
344+ . or_else ( || std:: env:: var_os ( "ANDROID_SDK_ROOT" ) . map ( PathBuf :: from) )
342345 . ok_or_else ( || anyhow:: anyhow!( "Failed to locate Android SDK" ) ) ?;
343346 let mut installed_ndks = read_dir ( android_home. join ( "ndk" ) )
344347 . map ( |dir| {
You can’t perform that action at this time.
0 commit comments