Allow mach build to explicitly set the media stack

You can select the media backend by building as follows:

$ ./mach build -d --media-stack=dummy
or
$ ./mach build -d --media-stack=gstreamer
This commit is contained in:
Alan Jeffrey 2019-05-17 14:50:08 -05:00 committed by Tuncer Ayaz
parent 91b612f8df
commit 4e3f164f7b
4 changed files with 24 additions and 7 deletions

View file

@ -71,6 +71,8 @@ script_traits = {path = "../script_traits"}
servo_config = {path = "../config"}
servo_geometry = {path = "../geometry"}
servo-media = {git = "https://github.com/servo/media"}
servo-media-dummy = {git = "https://github.com/servo/media", optional = true}
servo-media-gstreamer = {git = "https://github.com/servo/media", optional = true}
servo_url = {path = "../url"}
sparkle = "0.1"
style = {path = "../style", features = ["servo"]}
@ -90,10 +92,6 @@ gaol = "0.2.1"
[target.'cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows"))'.dependencies]
gstreamer = "0.14.5"
servo-media-gstreamer= {git = "https://github.com/servo/media"}
[target.'cfg(not(any(target_os = "android", target_arch = "x86_64", target_os = "windows")))'.dependencies.servo-media-dummy]
git = "https://github.com/servo/media"
[target.'cfg(target_os = "windows")'.dependencies]
mozangle = {version = "0.2"}

View file

@ -135,7 +135,7 @@ pub use msg::constellation_msg::TopLevelBrowsingContextId as BrowserId;
pub use servo_config as config;
pub use servo_url as url;
#[cfg(any(target_os = "android", target_arch = "x86_64", target_os = "windows",))]
#[cfg(feature = "servo-media-gstreamer")]
mod media_platform {
use super::ServoMedia;
use servo_media_gstreamer::GStreamerBackend;
@ -245,7 +245,7 @@ mod media_platform {
}
}
#[cfg(not(any(target_os = "android", target_arch = "x86_64", target_os = "windows",)))]
#[cfg(feature = "servo-media-dummy")]
mod media_platform {
use super::ServoMedia;
pub fn init() {