auto merge of servo#4216 : glennw/servo/android-demo, r=larsbergstrom

shanil-puri · Dec 4, 2014 · 0b909c2 · 0b909c2
2 parents 0b5cc3f + 6f6400e
commit 0b909c2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ports/android/jni/main.cpp b/ports/android/jni/main.cpp
@@ -76,7 +76,7 @@ static void init_servo()
 {
     LOGI("initializing native application for Servo");
 
-    setenv("RUST_LOG", "servo,gfx,msg,util,layers,js,glut,std,rt,extra", 1);
+    //setenv("RUST_LOG", "servo,gfx,msg,util,layers,js,glut,std,rt,extra", 1);
 
 //    setenv("SERVO_URL", "/mnt/sdcard/html/demo.html", 1);
 //    setenv("RUST_THREADS", "1", 1);
@@ -123,7 +123,7 @@ static void init_servo()
     *(void**)(&main) = dlsym(libservo, "android_start");
     if (main) {
         LOGI("go into android_start()");
-        static const char* argv[] = {"servo", "/mnt/sdcard/html/about-mozilla.html"};
+        static const char* argv[] = {"servo", "http://en.wikipedia.org/wiki/Rust"};
         (*main)(2, (char **)argv);
         return;
     }