From 4e9fa5d79900dd721b269a6851fddbec84123f9a Mon Sep 17 00:00:00 2001 From: Ryder Freeman Date: Wed, 26 Mar 2025 19:17:35 -0700 Subject: [PATCH] Enable Android (Termux) Compilation by Adjusting Conditional Compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove Android from the exclusion list in conditional configurations to allow successful compilation on Termux. Note: This change is solely to enable compilation; if clipboard functionality is desired on Termux, it can be implemented easily using Termux’s API. --- Cargo.toml | 2 +- src/lib.rs | 4 ++-- src/platform/mod.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dfe43991..46da5fd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,7 +81,7 @@ image = { version = "0.25", optional = true, default-features = false, features "tiff", ] } -[target.'cfg(all(unix, not(any(target_os="macos", target_os="android", target_os="emscripten"))))'.dependencies] +[target.'cfg(all(unix, not(any(target_os="macos", target_os="emscripten"))))'.dependencies] log = "0.4" x11rb = { version = "0.13" } wl-clipboard-rs = { version = "0.9.0", optional = true } diff --git a/src/lib.rs b/src/lib.rs index 47028273..d14bbeb8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -20,7 +20,7 @@ mod platform; #[cfg(all( unix, - not(any(target_os = "macos", target_os = "android", target_os = "emscripten")), + not(any(target_os = "macos", target_os = "emscripten")), ))] pub use platform::{ClearExtLinux, GetExtLinux, LinuxClipboardKind, SetExtLinux}; @@ -392,7 +392,7 @@ mod tests { } #[cfg(all( unix, - not(any(target_os = "macos", target_os = "android", target_os = "emscripten")), + not(any(target_os = "macos", target_os = "emscripten")), ))] { use crate::{LinuxClipboardKind, SetExtLinux}; diff --git a/src/platform/mod.rs b/src/platform/mod.rs index 268eb47e..781c41d6 100644 --- a/src/platform/mod.rs +++ b/src/platform/mod.rs @@ -1,8 +1,8 @@ -#[cfg(all(unix, not(any(target_os = "macos", target_os = "android", target_os = "emscripten"))))] +#[cfg(all(unix, not(any(target_os = "macos", target_os = "emscripten"))))] mod linux; #[cfg(all( unix, - not(any(target_os = "macos", target_os = "android", target_os = "emscripten")) + not(any(target_os = "macos", target_os = "emscripten")) ))] pub use linux::*;