From 19134be74f9db238c600f5b9edc964d7bed65ff0 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Thu, 28 Jul 2016 02:28:02 +0200
Subject: [PATCH] Add condition to not use video-metadata on aarch64
 architecture as well

---
 components/script/Cargo.toml              | 2 +-
 components/script/dom/htmlmediaelement.rs | 6 +++---
 components/script/lib.rs                  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index bd51a4022380..925119803f21 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(any(target_os = "android", target_arch = "arm")))'.dependencies]
+[target.'cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))'.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 eb0e4b0248cb..3804f04bc58d 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -35,7 +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")))]
+#[cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))]
 use video_metadata;
 
 struct HTMLMediaElementContext {
@@ -161,7 +161,7 @@ impl HTMLMediaElementContext {
         }
     }
 
-    #[cfg(not(any(target_os = "android", target_arch = "arm")))]
+    #[cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))]
     fn check_metadata(&mut self, elem: &HTMLMediaElement) {
         match video_metadata::get_format_from_slice(&self.data) {
             Ok(meta) => {
@@ -183,7 +183,7 @@ impl HTMLMediaElementContext {
         }
     }
 
-    #[cfg(any(target_os = "android", target_arch = "arm"))]
+    #[cfg(any(target_os = "android", target_arch = "arm", target_arch = "aarch64"))]
     fn check_metadata(&mut self, elem: &HTMLMediaElement) {
         // Step 6.
         elem.change_ready_state(HAVE_METADATA);
diff --git a/components/script/lib.rs b/components/script/lib.rs
index a9497eb46b36..988bb312b973 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(any(target_os = "android", target_arch = "arm")))]
+#[cfg(not(any(target_os = "android", target_arch = "arm", target_arch = "aarch64")))]
 extern crate video_metadata;
 extern crate webrender_traits;
 extern crate websocket;