Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13856 - mmatyas:fix_android_start, r=larsbergstrom

Browse source 
Remove `android_start!`

<!-- Please describe your changes on the following line: -->
Due to the API changes in `glutin` (1.x -> 2.x), the `android_start!` macro is no longer needed, and causes build error.

(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/13856)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-20 16:38:26 -05:00 • committed by GitHub
commit 8f182ecbc7
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/servo/main.rs
View file

@ -256,13 +256,6 @@ extern {
}
// This macro must be used at toplevel because it defines a nested
// module, but macros can only accept identifiers - not paths -
// preventing the expansion of this macro within the android module
// without use of an additionl stub method or other hackery.
#[cfg(target_os = "android")]
android_start!(main);
#[cfg(target_os = "android")]
mod android {
extern crate android_glue;