diff --git a/components/background_hang_monitor/Cargo.toml b/components/background_hang_monitor/Cargo.toml index 9b389dba174..5046bd6dff8 100644 --- a/components/background_hang_monitor/Cargo.toml +++ b/components/background_hang_monitor/Cargo.toml @@ -29,5 +29,8 @@ mach2 = { version = "0.4", optional = true } [target.'cfg(all(target_os = "linux", not(any(target_arch = "arm", target_arch = "aarch64", target_env = "ohos", target_env = "musl"))))'.dependencies] nix = { workspace = true, features = ["signal"], optional = true } +[target.'cfg(target_os = "android")'.dependencies] +nix = { workspace = true, features = ["signal"], optional = true } + [features] sampler = ["mach2", "nix"] diff --git a/components/background_hang_monitor/background_hang_monitor.rs b/components/background_hang_monitor/background_hang_monitor.rs index 6b9ae3b6172..68f4f39f3a4 100644 --- a/components/background_hang_monitor/background_hang_monitor.rs +++ b/components/background_hang_monitor/background_hang_monitor.rs @@ -97,6 +97,8 @@ impl BackgroundHangMonitorRegister for HangMonitorRegister { let sampler = crate::sampler_windows::WindowsSampler::new_boxed(); #[cfg(all(feature = "sampler", target_os = "macos"))] let sampler = crate::sampler_mac::MacOsSampler::new_boxed(); + #[cfg(all(feature = "sampler", target_os = "android"))] + let sampler = crate::sampler_linux::LinuxSampler::new_boxed(); #[cfg(all( feature = "sampler", target_os = "linux", @@ -110,7 +112,6 @@ impl BackgroundHangMonitorRegister for HangMonitorRegister { let sampler = crate::sampler_linux::LinuxSampler::new_boxed(); #[cfg(any( not(feature = "sampler"), - target_os = "android", all( target_os = "linux", any( diff --git a/components/background_hang_monitor/lib.rs b/components/background_hang_monitor/lib.rs index 8f594a7fc02..681815db090 100644 --- a/components/background_hang_monitor/lib.rs +++ b/components/background_hang_monitor/lib.rs @@ -17,6 +17,8 @@ mod sampler; )) ))] mod sampler_linux; +#[cfg(all(feature = "sampler", target_os = "android"))] +mod sampler_linux; #[cfg(all(feature = "sampler", target_os = "macos"))] mod sampler_mac; #[cfg(all(feature = "sampler", target_os = "windows"))]