aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2014-03-03 16:49:28 -0500
committerbors-servo <release+servo@mozilla.com>2014-03-03 16:49:28 -0500
commit4646975080c313cb448b348f22cefd426ab22858 (patch)
treef44b3ba47c2e45ec4d56a46e1c4fe2387ac51172 /src
parent411892484bec16b3d1212ae4141ec91bc3c3b27a (diff)
parentd97d20a1df59e24a948f70a72e76319b18777f9a (diff)
downloadservo-4646975080c313cb448b348f22cefd426ab22858.tar.gz
servo-4646975080c313cb448b348f22cefd426ab22858.zip
auto merge of #1798 : kmcallister/servo/android-args, r=jdm
Copy-paste fail from my c277d25506b61a34a3b28dcf4433e203ffa43284 r? @jdm
Diffstat (limited to 'src')
-rwxr-xr-xsrc/components/main/servo.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/main/servo.rs b/src/components/main/servo.rs
index 450e5b32b4d..4461ac6a972 100755
--- a/src/components/main/servo.rs
+++ b/src/components/main/servo.rs
@@ -131,7 +131,7 @@ pub extern "C" fn android_start(argc: int, argv: **u8) -> int {
args.push(str::raw::from_c_str(*argv.offset(i as int) as *i8));
}
}
- opts::from_cmdline_args(os::args()).map(run);
+ opts::from_cmdline_args(args).map(run);
})
}