Reduce 'android-18' duplication, as originally done by wenderen

Use android.platform (and $ANDROID_PLATFORM) for configuration, apply 'android-18' default
This commit is contained in:
Mitchell Hentges 2016-05-20 22:23:28 +02:00
parent dea610986d
commit 619212abf3
7 changed files with 16 additions and 16 deletions

View file

@ -27,6 +27,11 @@ fn main() {
let ndk_path = env::var("NDK_HOME").ok().expect("Please set the NDK_HOME environment variable");
let ndk_path = Path::new(&ndk_path);
// Get the target android platform from ANDROID_PLATFORM env. Expecting "android-{version}"
let android_platform = env::var("ANDROID_PLATFORM")
.ok()
.expect("Please set the ANDROID_PLATFORM environment variable")
// Get the standalone NDK path from NDK_STANDALONE env.
// let standalone_path = env::var("NDK_STANDALONE").ok().unwrap_or("/opt/ndk_standalone".to_string());
// let standalone_path = Path::new(&standalone_path);
@ -97,7 +102,7 @@ fn main() {
.arg("--name")
.arg("Servo")
.arg("--target")
.arg("android-18")
.arg(&android_platform)
.arg("--path")
.arg(".")
.stdout(Stdio::inherit())