fix(core): fallback to WRY_ANDROID_PACKAGE with backticks replaced (#…

…11348) ref: #11332
tauri-apps · Oct 14, 2024 · f3f521f · f3f521f
1 parent e75f0d2
commit f3f521f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.changes/android-unescaped.md b/.changes/android-unescaped.md
@@ -0,0 +1,5 @@
+---
+"tauri": "patch:bug"
+---
+
+Fix `TAURI_ANDROID_PACKAGE_UNESCAPED not set` panic during compilation for Android when using an older tauri cli.
diff --git a/crates/tauri/build.rs b/crates/tauri/build.rs
@@ -299,7 +299,8 @@ fn main() {
     }
 
     if let Some(project_dir) = env::var_os("TAURI_ANDROID_PROJECT_PATH").map(PathBuf::from) {
-      let package_unescaped = env_var("TAURI_ANDROID_PACKAGE_UNESCAPED");
+      let package_unescaped = env::var("TAURI_ANDROID_PACKAGE_UNESCAPED")
+        .unwrap_or_else(|_| env_var("WRY_ANDROID_PACKAGE").replace('`', ""));
       let tauri_proguard =
         include_str!("./mobile/proguard-tauri.pro").replace("$PACKAGE", &package_unescaped);
       std::fs::write(