diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 921825dbf96..79e1fb8f3c1 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -178,6 +178,7 @@ class CommandBase(object):
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 @@ class CommandBase(object):
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 ec4de5ee9e9..da3d8d73c80 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 3d1611517a8..3e22c93f50a 100644
--- a/support/android/apk/build.xml
+++ b/support/android/apk/build.xml
@@ -36,17 +36,9 @@
-
-
-
+
+
+