Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7486 - jdm:bad-android, r=glennw

Browse source 
Remove hack for android builders now that build is successful once more.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7486)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-09-01 07:50:56 -06:00
commit 8a15f941ed
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/servo/main.rs
View file

@ -183,10 +183,10 @@ mod android {
use self::libc::funcs::c95::stdio::fgets; use self::libc::funcs::c95::stdio::fgets;
use self::libc::funcs::posix88::stdio::fdopen; use self::libc::funcs::posix88::stdio::fdopen;
use self::libc::funcs::posix88::unistd::{pipe, dup2}; use self::libc::funcs::posix88::unistd::{pipe, dup2};
use servo::util::task::spawn_named;
use std::ffi::CStr; use std::ffi::CStr;
use std::ffi::CString; use std::ffi::CString;
use std::str::from_utf8; use std::str::from_utf8;
use util::task::spawn_named;
unsafe { unsafe {
let mut pipes: [c_int; 2] = [ 0, 0 ]; let mut pipes: [c_int; 2] = [ 0, 0 ];

3
python/servo/build_commands.py
View file

@ -242,9 +242,6 @@ class MachCommands(CommandBase):
notify_build_done(elapsed) notify_build_done(elapsed)
print("Build completed in %0.2fs" % elapsed) print("Build completed in %0.2fs" % elapsed)
# XXX(#7339) Android build is broken
if android:
return 0
return status return status
@Command('build-cef', @Command('build-cef',