From d76e1b117d4ce55eb192217612a596a893e5af5f Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Sun, 5 Jan 2025 15:31:05 +1300 Subject: [PATCH] Fix android compilation (linking fails) --- packages/blitz-dom/Cargo.toml | 4 +++- packages/blitz-shell/src/lib.rs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/blitz-dom/Cargo.toml b/packages/blitz-dom/Cargo.toml index 2b09370a..226029ef 100644 --- a/packages/blitz-dom/Cargo.toml +++ b/packages/blitz-dom/Cargo.toml @@ -34,7 +34,6 @@ taffy = { workspace = true } # Linebender dependencies parley = { workspace = true } peniko = { workspace = true } -arboard = { workspace = true, optional = true } # Other dependencies slab = { workspace = true } @@ -55,3 +54,6 @@ cursor-icon = { workspace = true } # Rendering raw-window-handle = { workspace = true } + +[target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux",target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies] +arboard = { workspace = true, optional = true } diff --git a/packages/blitz-shell/src/lib.rs b/packages/blitz-shell/src/lib.rs index fe8539cc..4516c7d3 100644 --- a/packages/blitz-shell/src/lib.rs +++ b/packages/blitz-shell/src/lib.rs @@ -64,7 +64,7 @@ pub fn set_android_app(app: android_activity::AndroidApp) { #[cfg_attr(docsrs, doc(cfg(target_os = "android")))] /// Get the current [`AndroidApp`](android_activity::AndroidApp). /// This will panic if the android activity has not been setup with [`set_android_app`]. -pub fn current_android_app(app: android_activity::AndroidApp) -> AndroidApp { +pub fn current_android_app() -> android_activity::AndroidApp { ANDROID_APP.get().unwrap().clone() }