From ee358cd12dec3ad3896443d05121b2c2013be52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ty=C3=A1s=20Mustoha?= <mmatyas@inf.u-szeged.hu>
Date: Thu, 20 Oct 2016 16:33:33 +0200
Subject: [PATCH] Fix missing `backtrace` build error on Android

---
 components/servo/Cargo.toml | 2 +-
 components/servo/main.rs    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index cb62e926809..1ae8de5dbc2 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -45,6 +45,7 @@ style_tests = {path = "../../tests/unit/style"}
 util_tests = {path = "../../tests/unit/util"}
 
 [dependencies]
+backtrace = "0.2"
 browserhtml = {git = "https://github.com/browserhtml/browserhtml", branch = "crate"}
 canvas = {path = "../canvas"}
 canvas_traits = {path = "../canvas_traits"}
@@ -88,7 +89,6 @@ features = ["serde_derive"]
 
 [target.'cfg(not(target_os = "android"))'.dependencies]
 sig = "0.1"
-backtrace = "0.2"
 
 [target.'cfg(target_os = "android")'.dependencies]
 log = "0.3"
diff --git a/components/servo/main.rs b/components/servo/main.rs
index ddba3b38f51..b70acb720fa 100644
--- a/components/servo/main.rs
+++ b/components/servo/main.rs
@@ -20,7 +20,6 @@
 #[cfg(target_os = "android")]
 #[macro_use]
 extern crate android_glue;
-#[cfg(not(target_os = "android"))]
 extern crate backtrace;
 // The window backed by glutin
 extern crate glutin_app as app;