diff --git a/servo-media/Cargo.toml b/servo-media/Cargo.toml index db082245..d03f6151 100644 --- a/servo-media/Cargo.toml +++ b/servo-media/Cargo.toml @@ -12,5 +12,5 @@ path = "../audio" [dependencies.servo-media-player] path = "../player" -[target.'cfg(any(target_os = "android", target_arch = "x86_64"))'.dependencies.servo-media-gstreamer] +[target.'cfg(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64"))'.dependencies.servo-media-gstreamer] path = "../backends/gstreamer" diff --git a/servo-media/src/lib.rs b/servo-media/src/lib.rs index 2748c194..4bdf0e19 100644 --- a/servo-media/src/lib.rs +++ b/servo-media/src/lib.rs @@ -1,5 +1,5 @@ pub extern crate servo_media_audio as audio; -#[cfg(any(target_os = "android", target_arch = "x86_64"))] +#[cfg(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64"))] extern crate servo_media_gstreamer; pub extern crate servo_media_player as player; use std::sync::{self, Arc, Mutex, Once}; @@ -40,14 +40,14 @@ impl DummyBackend { pub fn init() {} } -#[cfg(any(target_os = "android", target_arch = "x86_64"))] +#[cfg(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64"))] pub type Backend = servo_media_gstreamer::GStreamerBackend; -#[cfg(not(any(target_os = "android", target_arch = "x86_64")))] +#[cfg(not(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64")))] pub type Backend = DummyBackend; -#[cfg(any(target_os = "android", target_arch = "x86_64"))] +#[cfg(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64"))] pub type Error = servo_media_gstreamer::BackendError; -#[cfg(not(any(target_os = "android", target_arch = "x86_64")))] +#[cfg(not(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64")))] pub type Error = (); impl ServoMedia {