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

Auto merge of #9908 - UK992:tidy-fix, r=ecoal95

Browse source 
Check tidy for "support/android/build-apk/"

Fixes  #9893
r? @ecoal95

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9908)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-08 12:27:08 +05:30
commit e3bea4f887
2 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/tidy.py
View file

@ -35,7 +35,8 @@ ignored_files = [
ignored_dirs = [
# Upstream
os.path.join(".", "support"),
os.path.join(".", "support", "android", "apk"),
os.path.join(".", "support", "rust-task_info"),
os.path.join(".", "tests", "wpt", "css-tests"),
os.path.join(".", "tests", "wpt", "harness"),
os.path.join(".", "tests", "wpt", "update"),

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

@ -42,7 +42,7 @@ fn main() {
if debug {
env::set_var("NDK_DEBUG", "1");
env::set_var("APP_OPTIM", "0");
} else{
} else {
// Overrides android:debuggable propery in the .xml file.
env::set_var("APP_OPTIM", "1");
}
@ -77,14 +77,14 @@ fn main() {
}
// Copy over the resources
let cpcmd= Command::new("cp")
.arg("-R")
.arg(&resdir)
.arg(&directory.join("assets"))
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.current_dir(directory.clone())
.status();
let cpcmd = Command::new("cp")
.arg("-R")
.arg(&resdir)
.arg(&directory.join("assets"))
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.current_dir(directory.clone())
.status();
if cpcmd.is_err() || cpcmd.unwrap().code().unwrap() != 0 {
println!("Error while copying files from the resources dir to the assets dir");
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")));
},
"-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" => {
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" => {
let name = args.next().expect("-l must be followed by a library name");