diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-10-20 16:38:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-20 16:38:26 -0500 |
| commit | 8f182ecbc75b76a56b2b2c887a30dc2563b2d8ba (patch) | |
| tree | 79255064cd3ce56d85f311fd9a8e28941c7cc19d /components/servo/main.rs | |
| parent | 77dd618e7a7c8c67df94e795a2727fb437ee7f21 (diff) | |
| parent | 522438dd35ddf94e8f13ba7a0c68d1e318e7b2ea (diff) | |
| download | servo-8f182ecbc75b76a56b2b2c887a30dc2563b2d8ba.tar.gz servo-8f182ecbc75b76a56b2b2c887a30dc2563b2d8ba.zip | |
Auto merge of #13856 - mmatyas:fix_android_start, r=larsbergstrom
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 -->
Diffstat (limited to 'components/servo/main.rs')
| -rw-r--r-- | components/servo/main.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/components/servo/main.rs b/components/servo/main.rs index b70acb720fa..62c0de43be0 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -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; |