Auto merge of #6109 - glennw:android-fix, r=larsbergstrom

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6109)
<!-- Reviewable:end -->

1 files changed, 15 insertions, 3 deletions

diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
index 75746349ec2..fa81f3b5db4 100644
--- a/ports/glutin/window.rs
+++ b/ports/glutin/window.rs
@@ -256,13 +256,13 @@ impl Window {
         self.event_queue.borrow_mut().push(WindowEvent::MouseWindowEventClass(event));
     }
 
-    #[cfg(not(target_os="linux"))]
+    #[cfg(target_os="macos")]
     fn handle_next_event(&self) -> bool {
         let event = self.window.wait_events().next().unwrap();
         self.handle_window_event(event)
     }
 
-    #[cfg(target_os="linux")]
+    #[cfg(any(target_os="linux", target_os="android"))]
     fn handle_next_event(&self) -> bool {
         use std::thread::sleep_ms;
 
@@ -442,6 +442,18 @@ impl Window {
     }
 }
 
+// WindowProxy is not implemented for android yet
+
+#[cfg(all(feature = "window", target_os="android"))]
+fn create_window_proxy(_: &Rc<Window>) -> Option<glutin::WindowProxy> {
+    None
+}
+
+#[cfg(all(feature = "window", not(target_os="android")))]
+fn create_window_proxy(window: &Rc<Window>) -> Option<glutin::WindowProxy> {
+    Some(window.window.create_window_proxy())
+}
+
 #[cfg(feature = "window")]
 impl WindowMethods for Window {
     fn framebuffer_size(&self) -> TypedSize2D<DevicePixel, u32> {
@@ -464,7 +476,7 @@ impl WindowMethods for Window {
         let (sender, receiver) = channel();
 
         let window_proxy = match window {
-            &Some(ref window) => Some(window.window.create_window_proxy()),
+            &Some(ref window) => create_window_proxy(window),
             &None => None,
         };