fix(android): fix android_binding macro expantion

tauri-apps · Oct 29, 2024 · 4b7523f · 4b7523f
1 parent 67e44e4
commit 4b7523f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.changes/fix-android-binding-macro.md b/.changes/fix-android-binding-macro.md
@@ -0,0 +1,5 @@
+---
+"tao": "patch"
+---
+
+Fix `android_binding` macro incorrect expansion.
diff --git a/src/platform_impl/android/ndk_glue.rs b/src/platform_impl/android/ndk_glue.rs
@@ -52,7 +52,8 @@ macro_rules! android_binding {
     ::tao::android_binding!($domain, $package, $activity, $setup, $main, ::tao)
   };
   ($domain:ident, $package:ident, $activity:ident, $setup:path, $main:ident, $tao:path) => {{
-    use $tao::platform::android::prelude::{android_fn, *};
+    // NOTE: be careful when changing how this use statement is written
+    use $tao::{platform::android::prelude::android_fn, platform::android::prelude::*};
     fn _____tao_store_package_name__() {
       PACKAGE.get_or_init(move || generate_package_name!($domain, $package));
     }