Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #8460 - Disable zipalign until we have stable builder automation to install a… (from larsbergstrom:remove_zipalign); r=Ms2ger

Browse Source 
…nd locate it

r? @mbrubeck

The basic problem here is that `zipalign` is in the tools directory on some installs, in build-tools/22.0 on some, build-tools/20.0 on others, etc. I'll need to find a more stable way of locating the tool (even if it's just shelling out to `find` - I almost autoconf!). Disabling use of it for now since it's optional and is currently breaking our nightly builds.

Source-Repo: https://github.com/servo/servo
Source-Revision: 75e01de627376d987cff8bc87b5f23c79e5f36af
This commit is contained in:
Lars Bergstrom 2015-11-11 20:45:03 +05:01
parent c79a3bc7db
commit 026f33c3d4
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
servo/support/android/build-apk/src/main.rs
View File

@ -194,22 +194,7 @@ fn main() {
process::exit(1);
}
let aligncmd = Command::new(sdk_path.join("tools").join("zipalign"))
.arg("-f")
.arg("-v")
.arg("4")
.arg(&directory.join("bin").join("Servo-release-unsigned.apk"))
.arg(&directory.join("bin").join("Servo-release.apk"))
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
.current_dir(directory.clone())
.status();
if aligncmd.is_err() || aligncmd.unwrap().code().unwrap() != 0 {
println!("Error while using `zipalign` to sign the APK.");
process::exit(1);
}
fs::copy(&directory.join("bin").join("Servo-release.apk"),
fs::copy(&directory.join("bin").join("Servo-release-unsigned.apk"),
&args.output).unwrap();
}