Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

modify way to call main on android

Browse source
This commit is contained in:
aydin.kim 2013-12-06 15:47:36 +09:00
parent 230bfeb0cd
commit 318d06f38b
1 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/components/main/servo.rc
View file

@ -56,6 +56,8 @@ pub use servo_util::url::make_url;
use std::comm;
#[cfg(not(test))]
use std::os;
#[cfg(not(test))]
use std::str;
use std::task::spawn_with;
#[path="compositing/compositor_task.rs"]
@ -100,27 +102,26 @@ pub mod platform;
#[path = "util/mod.rs"]
pub mod util;
#[cfg(not(test))]
#[cfg(not(test), target_os="linux")]
#[cfg(not(test), target_os="macos")]
#[start]
fn start(argc: int, argv: **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) {
run(getopts())
run(opts::from_cmdline_args(os::args()))
}
}
#[cfg(not(test), target_os="android")]
#[no_mangle]
pub extern "C" fn android_start(argc: int, argv: **u8) -> int {
do std::rt::start_on_main_thread(argc, argv) {
let mut args:~[~str] = ~[];
for i in range(0u, argc as uint) {
unsafe {
args.push(str::raw::from_c_str(*argv.offset(i as int) as *i8));
}
}
run(opts::from_cmdline_args(args))
}
}