From 2521bc551bb35df19dec8c2514d961a4f5357486 Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Thu, 14 May 2015 16:51:47 -0500 Subject: [PATCH 1/2] Update the environment variable debug code for new Rust --- components/servo/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/servo/main.rs b/components/servo/main.rs index 53002888b4a..5c15b1a6c48 100644 --- a/components/servo/main.rs +++ b/components/servo/main.rs @@ -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); } From da88ac3744ca5edab58ff71a6369269dcba38dcc Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Thu, 14 May 2015 16:52:17 -0500 Subject: [PATCH 2/2] Re-update the android-rs-glue submodule --- support/android-rs-glue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/android-rs-glue b/support/android-rs-glue index 10116eb3af3..dc8aef3e1b8 160000 --- a/support/android-rs-glue +++ b/support/android-rs-glue @@ -1 +1 @@ -Subproject commit 10116eb3af332f9565e0fb803e600511bb585d6b +Subproject commit dc8aef3e1b8f1acd141986cfab492e3f57d2d5f6