Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-28 19:13:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13855 - mmatyas:fix_android_backtrace, r=larsbergstrom

Browse source 
Fix missing `backtrace` build error on Android

<!-- Please describe your changes on the following line: -->
The missing `backtrace` causes compile errors when building for Android (introduced by servo/servo#12657). This PR fixes the problem by enabling `backtrace` on Android too.

(This is a fix for servo/servo#13154)

<!-- 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/13855)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-20 14:55:49 -05:00 • committed by GitHub
commit 2c2d340fbc
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/servo/Cargo.toml
View file

@ -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"

1
components/servo/main.rs
View file

@ -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;