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

Tidy fix

Browse source
This commit is contained in:
UK992 2016-03-08 01:38:49 +01:00
parent 607cd5923e
commit 193fc1f84e
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
support/android/build-apk/src/main.rs
View file

@ -42,7 +42,7 @@ fn main() {
if debug { if debug {
env::set_var("NDK_DEBUG", "1"); env::set_var("NDK_DEBUG", "1");
env::set_var("APP_OPTIM", "0"); env::set_var("APP_OPTIM", "0");
} else{ } else {
// Overrides android:debuggable propery in the .xml file. // Overrides android:debuggable propery in the .xml file.
env::set_var("APP_OPTIM", "1"); env::set_var("APP_OPTIM", "1");
} }
@ -77,14 +77,14 @@ fn main() {
} }
// Copy over the resources // Copy over the resources
let cpcmd= Command::new("cp") let cpcmd = Command::new("cp")
.arg("-R") .arg("-R")
.arg(&resdir) .arg(&resdir)
.arg(&directory.join("assets")) .arg(&directory.join("assets"))
.stdout(Stdio::inherit()) .stdout(Stdio::inherit())
.stderr(Stdio::inherit()) .stderr(Stdio::inherit())
.current_dir(directory.clone()) .current_dir(directory.clone())
.status(); .status();
if cpcmd.is_err() || cpcmd.unwrap().code().unwrap() != 0 { if cpcmd.is_err() || cpcmd.unwrap().code().unwrap() != 0 {
println!("Error while copying files from the resources dir to the assets dir"); println!("Error while copying files from the resources dir to the assets dir");
process::exit(1); process::exit(1);
@ -237,10 +237,12 @@ fn parse_arguments() -> (Args, Vec<String>) {
result_output = Some(PathBuf::from(args.next().expect("-o must be followed by the output name"))); result_output = Some(PathBuf::from(args.next().expect("-o must be followed by the output name")));
}, },
"-r" => { "-r" => {
result_root_path = Some(PathBuf::from(args.next().expect("-r must be followed by the enlistment root directory"))); result_root_path =
Some(PathBuf::from(args.next().expect("-r must be followed by the enlistment root directory")));
}, },
"-t" => { "-t" => {
result_target_path = Some(PathBuf::from(args.next().expect("-t must be followed by the target output directory"))); result_target_path =
Some(PathBuf::from(args.next().expect("-t must be followed by the target output directory")));
}, },
"-l" => { "-l" => {
let name = args.next().expect("-l must be followed by a library name"); let name = args.next().expect("-l must be followed by a library name");