aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/script/Cargo.toml2
-rw-r--r--components/script/dom/htmlmediaelement.rs7
-rw-r--r--components/script/lib.rs2
3 files changed, 6 insertions, 5 deletions
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index 2847a39a180..bd51a402238 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -17,7 +17,7 @@ debugmozjs = ['js/debugmozjs']
[target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies]
tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"}
-[target.'cfg(not(target_os = "android"))'.dependencies]
+[target.'cfg(not(any(target_os = "android", target_arch = "arm")))'.dependencies]
video-metadata = {git = "https://github.com/GuillaumeGomez/video-metadata-rs"}
[dependencies]
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index d3a0562173f..eb0e4b0248c 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -35,6 +35,7 @@ use string_cache::Atom;
use task_source::TaskSource;
use time::{self, Timespec, Duration};
use url::Url;
+#[cfg(not(any(target_os = "android", target_arch = "arm")))]
use video_metadata;
struct HTMLMediaElementContext {
@@ -160,7 +161,7 @@ impl HTMLMediaElementContext {
}
}
- #[cfg(not(target_os = "android"))]
+ #[cfg(not(any(target_os = "android", target_arch = "arm")))]
fn check_metadata(&mut self, elem: &HTMLMediaElement) {
match video_metadata::get_format_from_slice(&self.data) {
Ok(meta) => {
@@ -182,8 +183,8 @@ impl HTMLMediaElementContext {
}
}
- #[cfg(target_os = "android")]
- fn check_metadata(&mut self, _elem: &HTMLMediaElement) {
+ #[cfg(any(target_os = "android", target_arch = "arm"))]
+ fn check_metadata(&mut self, elem: &HTMLMediaElement) {
// Step 6.
elem.change_ready_state(HAVE_METADATA);
self.have_metadata = true;
diff --git a/components/script/lib.rs b/components/script/lib.rs
index 792aa24b438..a9497eb46b3 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -88,7 +88,7 @@ extern crate url;
#[macro_use]
extern crate util;
extern crate uuid;
-#[cfg(not(target_os = "android"))]
+#[cfg(not(any(target_os = "android", target_arch = "arm")))]
extern crate video_metadata;
extern crate webrender_traits;
extern crate websocket;