Auto merge of #19152 - nox:media, r=jdm

Include gecko-media in the dependency graph

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19152)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-14 11:51:34 -06:00 committed by GitHub
commit d7b4471c80
6 changed files with 209 additions and 6 deletions

View file

@ -23,6 +23,9 @@ phf_codegen = "0.7.18"
phf_shared = "0.7.18"
serde_json = "1.0"
[target.'cfg(all(any(target_os = "macos", target_os = "linux"), not(any(target_arch = "arm", target_arch = "aarch64"))))'.dependencies]
gecko-media = {git = "https://github.com/servo/gecko-media.git"}
[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
tinyfiledialogs = "2.5.9"

View file

@ -41,6 +41,9 @@ extern crate domobject_derive;
extern crate encoding_rs;
extern crate euclid;
extern crate fnv;
#[allow(unused_extern_crates)]
#[cfg(all(any(target_os = "macos", target_os = "linux"), not(any(target_arch = "arm", target_arch = "aarch64"))))]
extern crate gecko_media;
extern crate gleam;
extern crate half;
#[macro_use] extern crate html5ever;