From 619212abf3d62a83e97dfdb3d8d1a085bf2db792 Mon Sep 17 00:00:00 2001
From: Mitchell Hentges <mitchhentges@protonmail.com>
Date: Fri, 20 May 2016 22:23:28 +0200
Subject: [PATCH] Reduce 'android-18' duplication, as originally done by
 wenderen

Use android.platform (and $ANDROID_PLATFORM) for configuration, apply 'android-18' default
---
 python/servo/command_base.py           |  3 +++
 servobuild.example                     |  3 ++-
 support/android/apk/build.xml          | 14 +++-----------
 support/android/apk/jni/Application.mk |  2 +-
 support/android/apk/project.properties |  1 -
 support/android/build-apk/src/main.rs  |  7 ++++++-
 support/android/openssl.sh             |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 support/android/apk/project.properties

diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 921825dbf96d..79e1fb8f3c15 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -178,6 +178,7 @@ def resolverelative(category, key):
         self.config["android"].setdefault("sdk", "")
         self.config["android"].setdefault("ndk", "")
         self.config["android"].setdefault("toolchain", "")
+        self.config["android"].setdefault("platform", "android-18")
         self.config["android"].setdefault("target", "arm-linux-androideabi")
 
         self.config.setdefault("gonk", {})
@@ -318,6 +319,8 @@ def build_env(self, gonk=False, hosts_file_path=None, target=None):
             env["ANDROID_NDK"] = self.config["android"]["ndk"]
         if self.config["android"]["toolchain"]:
             env["ANDROID_TOOLCHAIN"] = self.config["android"]["toolchain"]
+        if self.config["android"]["platform"]:
+            env["ANDROID_PLATFORM"] = self.config["android"]["platform"]
 
         if gonk:
             if self.config["gonk"]["b2g"]:
diff --git a/servobuild.example b/servobuild.example
index ec4de5ee9e99..da3d8d73c80b 100644
--- a/servobuild.example
+++ b/servobuild.example
@@ -41,10 +41,11 @@ debug-mozjs = false
 
 # Android information
 [android]
-# Defaults to the value of $ANDROID_SDK, $ANDROID_NDK, $ANDROID_TOOLCHAIN respectively
+# Defaults to the value of $ANDROID_SDK, $ANDROID_NDK, $ANDROID_TOOLCHAIN, $ANDROID_PLATFORM respectively
 #sdk = "/opt/android-sdk"
 #ndk = "/opt/android-ndk"
 #toolchain = "/opt/android-toolchain"
+#platform = "android-18"
 
 # Gonk information
 # Please fill the ndk/toolchain for Android too
diff --git a/support/android/apk/build.xml b/support/android/apk/build.xml
index 3d1611517a80..3e22c93f50a9 100644
--- a/support/android/apk/build.xml
+++ b/support/android/apk/build.xml
@@ -36,17 +36,9 @@
     <condition property="sdk.dir" value="${env.ANDROID_HOME}">
         <isset property="env.ANDROID_HOME" />
     </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
+    <condition property="target" value="${env.ANDROID_PLATFORM}">
+        <isset property="env.ANDROID_PLATFORM" />
+    </condition>
 
     <!-- quick check on sdk.dir -->
     <fail
diff --git a/support/android/apk/jni/Application.mk b/support/android/apk/jni/Application.mk
index 3784f3fc6c55..794d4261d5a8 100644
--- a/support/android/apk/jni/Application.mk
+++ b/support/android/apk/jni/Application.mk
@@ -1,2 +1,2 @@
 APP_ABI := armeabi
-APP_PLATFORM := android-18
+APP_PLATFORM := $(ANDROID_PLATFORM)
diff --git a/support/android/apk/project.properties b/support/android/apk/project.properties
deleted file mode 100644
index c0442c37105c..000000000000
--- a/support/android/apk/project.properties
+++ /dev/null
@@ -1 +0,0 @@
-target=android-18
diff --git a/support/android/build-apk/src/main.rs b/support/android/build-apk/src/main.rs
index f9326f764520..0440cce87115 100644
--- a/support/android/build-apk/src/main.rs
+++ b/support/android/build-apk/src/main.rs
@@ -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())
diff --git a/support/android/openssl.sh b/support/android/openssl.sh
index 18dd9b2f325a..c03d077b2bae 100755
--- a/support/android/openssl.sh
+++ b/support/android/openssl.sh
@@ -36,7 +36,7 @@ _ANDROID_ARCH=arch-arm
 # Android 5.0, there will likely be another platform added (android-22?).
 # This value is always used.
 # _ANDROID_API="android-14"
-_ANDROID_API="android-18"
+_ANDROID_API="$ANDROID_PLATFORM"
 # _ANDROID_API="android-19"
 
 #####################################################################