Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-19 22:59:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/command_base.py
View file

@ -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"]: