From 7457dbf3fcd86991d5cea5e7635b47e06348d9d8 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 31 Aug 2015 20:56:12 -0400 Subject: [PATCH] Remove hack for android builders now that build is successful once more. --- components/servo/main.rs | 2 +- python/servo/build_commands.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/components/servo/main.rs b/components/servo/main.rs index 530bbf639ee..3c8be21e1fe 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -183,10 +183,10 @@ mod android { use self::libc::funcs::c95::stdio::fgets; use self::libc::funcs::posix88::stdio::fdopen; use self::libc::funcs::posix88::unistd::{pipe, dup2}; + use servo::util::task::spawn_named; use std::ffi::CStr; use std::ffi::CString; use std::str::from_utf8; - use util::task::spawn_named; unsafe { let mut pipes: [c_int; 2] = [ 0, 0 ]; diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index d49632882e5..73d9b9046fa 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -242,9 +242,6 @@ class MachCommands(CommandBase): notify_build_done(elapsed) print("Build completed in %0.2fs" % elapsed) - # XXX(#7339) Android build is broken - if android: - return 0 return status @Command('build-cef',