From c3bae15570dd3cdc3b41960f950b51b5ef169ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Tue, 18 Sep 2018 10:27:01 +0200 Subject: [PATCH 1/2] Enable Gstreamer backend for Android --- 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 5ef193e7..db082245 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(all(not(target_os = "android"), target_arch = "x86_64"))'.dependencies.servo-media-gstreamer] +[target.'cfg(any(target_os = "android", 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 16bf28fe..ca221ee4 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(all(not(target_os = "android"), target_arch = "x86_64"))] +#[cfg(any(target_os = "android", 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,9 +40,9 @@ impl DummyBackend { pub fn init() {} } -#[cfg(all(not(target_os = "android"), target_arch = "x86_64"))] +#[cfg(any(target_os = "android", target_arch = "x86_64"))] pub type Backend = servo_media_gstreamer::GStreamerBackend; -#[cfg(not(all(not(target_os = "android"), target_arch = "x86_64")))] +#[cfg(not(any(target_os = "android", target_arch = "x86_64")))] pub type Backend = DummyBackend; impl ServoMedia { From e0bfb276e2d2b5d09d994e3c068ce09e9a79fa7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Tue, 18 Sep 2018 15:50:55 +0200 Subject: [PATCH 2/2] Fetch gstreamer binaries for x86 target --- backends/gstreamer/build.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/backends/gstreamer/build.rs b/backends/gstreamer/build.rs index dbcc61c0..10442dcc 100644 --- a/backends/gstreamer/build.rs +++ b/backends/gstreamer/build.rs @@ -31,7 +31,12 @@ fn android_main(target: &str) { .unwrap() .is_match(target) { - "gst-build-x86_g4" + "gst-build-x86_64" + } else if Regex::new("i686-([a-z])*-android") + .unwrap() + .is_match(target) + { + "gst-build-x86" } else { panic!("Invalid target architecture {}", target); };