From 6cfc3a8546721f1c6adb3cc06539bd04235ed376 Mon Sep 17 00:00:00 2001 From: "aydin.kim" Date: Wed, 7 Aug 2013 20:08:58 +0900 Subject: [PATCH] add android main --- src/components/main/servo.rc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/components/main/servo.rc b/src/components/main/servo.rc index bb16497fe65..0fceaf5ab6b 100755 --- a/src/components/main/servo.rc +++ b/src/components/main/servo.rc @@ -101,9 +101,24 @@ pub mod util; #[cfg(not(test))] #[start] fn start(argc: int, argv: **u8, crate_map: *u8) -> int { + #[cfg(target_os="linux")] + #[cfg(target_os="macos")] + fn getopts() -> Opts { + opts::from_cmdline_args(os::args()) + } + #[cfg(target_os="android")] + fn getopts() -> Opts { + let mut args:~[~str] = ~[]; + args.push(~"servo"); + let servo_url = os::getenv(~"SERVO_URL"); + match servo_url { + Some(s) => { args.push(s); }, + None => { fail!("No url input"); } + } + opts::from_cmdline_args(args) + } do std::rt::start_on_main_thread(argc, argv, crate_map) { - let opts = opts::from_cmdline_args(os::args()); - run(opts) + run(getopts()) } }