diff options
| author | Alan Jeffrey <ajeffrey@mozilla.com> | 2019-08-06 17:59:22 -0500 |
|---|---|---|
| committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2019-08-08 16:52:50 -0500 |
| commit | 11b3d78f403f901b1badd336c35d9d4fda804dab (patch) | |
| tree | fe61c459b8d72330781b60f9974de3fd89f21bee /components/servo | |
| parent | 555fa75b2c7f4faa0818e86296a4ea3d5b8e4d42 (diff) | |
| download | servo-11b3d78f403f901b1badd336c35d9d4fda804dab.tar.gz servo-11b3d78f403f901b1badd336c35d9d4fda804dab.zip | |
Added gstreamer support to the magicleap port
Diffstat (limited to 'components/servo')
| -rw-r--r-- | components/servo/Cargo.toml | 4 | ||||
| -rw-r--r-- | components/servo/lib.rs | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 73ac1c901a9..8aef630db78 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -85,10 +85,10 @@ webxr-api = {git = "https://github.com/servo/webxr"} [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies] gaol = {git = "https://github.com/servo/gaol"} -[target.'cfg(all(not(target_os = "windows"), any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64")))'.dependencies.servo-media-gstreamer] +[target.'cfg(all(not(target_os = "windows"), any(target_os = "android", target_arch = "x86_64")))'.dependencies.servo-media-gstreamer] git = "https://github.com/servo/media" -[target.'cfg(any(target_os = "windows", not(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64"))))'.dependencies.servo-media-dummy] +[target.'cfg(any(target_os = "windows", not(any(target_os = "android", target_arch = "x86_64"))))'.dependencies.servo-media-dummy] git = "https://github.com/servo/media" [target.'cfg(target_os = "windows")'.dependencies] diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 9b4f108649b..08b3d2766fc 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -127,10 +127,7 @@ pub use servo_url as url; #[cfg(all( not(target_os = "windows"), - any( - all(target_os = "android", target_arch = "arm"), - target_arch = "x86_64", - ) + any(target_os = "android", target_arch = "x86_64",) ))] mod media_platform { use super::ServoMedia; @@ -211,10 +208,7 @@ mod media_platform { #[cfg(not(all( not(target_os = "windows"), - any( - all(target_os = "android", target_arch = "arm"), - target_arch = "x86_64", - ) + any(target_os = "android", target_arch = "x86_64",) )))] mod media_platform { use super::ServoMedia; |