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 #4216 : glennw/servo/android-demo, r=larsbergstrom

Browse source
This commit is contained in:
bors-servo 2014-12-03 22:01:11 -07:00
commit 0b909c2e93
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ports/android/jni/main.cpp
View file

@ -76,7 +76,7 @@ static void init_servo()
{ {
LOGI("initializing native application for 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("SERVO_URL", "/mnt/sdcard/html/demo.html", 1);
// setenv("RUST_THREADS", "1", 1); // setenv("RUST_THREADS", "1", 1);
@ -123,7 +123,7 @@ static void init_servo()
*(void**)(&main) = dlsym(libservo, "android_start"); *(void**)(&main) = dlsym(libservo, "android_start");
if (main) { if (main) {
LOGI("go into android_start()"); 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); (*main)(2, (char **)argv);
return; return;
} }