From e5b18a2a1305c423f0d33b157824e84d500a8343 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 26 Jul 2018 16:54:46 -0700 Subject: [PATCH] Turn off gstreamer for non-x86 --- servo-media/Cargo.toml | 2 +- servo-media/src/lib.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/servo-media/Cargo.toml b/servo-media/Cargo.toml index b5547806..d13054e8 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(not(target_os = "android"))'.dependencies.servo-media-gstreamer] +[target.'cfg(and(not(target_os = "android"), target_arch = "x86"))'.dependencies.servo-media-gstreamer] path = "../backends/gstreamer" diff --git a/servo-media/src/lib.rs b/servo-media/src/lib.rs index 756f3808..8e4071e8 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(not(target_os = "android"))] +#[cfg(and(not(target_os = "android"), target_arch = "x86"))] extern crate servo_media_gstreamer; pub extern crate servo_media_player as player; use std::sync::{self, Arc, Mutex, Once}; @@ -37,9 +37,9 @@ impl PlayerBackend for DummyBackend { } } -#[cfg(not(target_os = "android"))] +#[cfg(and(not(target_os = "android"), target_arch = "x86"))] pub type Backend = servo_media_gstreamer::GStreamerBackend; -#[cfg(target_os = "android")] +#cfg(not(and(not(target_os = "android"), target_arch = "x86")))] pub type Backend = DummyBackend; impl ServoMedia {