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

Auto merge of #6054 - larsbergstrom:android_refixup, r=mbrubeck

Browse source 
It appears that https://github.com/servo/servo/pull/6012 reverted our attempts to update the android submodule - probably a bad rebase. This re-fixes it and also updates the debugging code to modern Rust.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6054)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-14 16:56:25 -05:00
commit 5bdf20e94e
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/servo/main.rs
View file

@ -173,7 +173,9 @@ mod android {
pub fn setup_logging() {
use self::libc::consts::os::posix88::{STDERR_FILENO, STDOUT_FILENO};
//os::setenv("RUST_LOG", "servo,gfx,msg,util,layers,js,std,rt,extra");
//use std::env;
//env::set_var("RUST_LOG", "servo,gfx,msg,util,layers,js,std,rt,extra");
redirect_output(STDERR_FILENO);
redirect_output(STDOUT_FILENO);
}

2
support/android-rs-glue

@ -1 +1 @@
Subproject commit 10116eb3af332f9565e0fb803e600511bb585d6b
Subproject commit dc8aef3e1b8f1acd141986cfab492e3f57d2d5f6