diff options
| author | Mitchell Hentges <mitchhentges@protonmail.com> | 2016-05-20 22:23:28 +0200 |
|---|---|---|
| committer | Mitchell Hentges <mitchhentges@protonmail.com> | 2016-05-20 22:23:28 +0200 |
| commit | 619212abf3d62a83e97dfdb3d8d1a085bf2db792 (patch) | |
| tree | 30d1138018ccfc9b3fafec10fa1bada9e36f66c3 /python/servo/command_base.py | |
| parent | dea610986dbf4a1e5898cbe6b57832784e786f3a (diff) | |
| download | servo-619212abf3d62a83e97dfdb3d8d1a085bf2db792.tar.gz servo-619212abf3d62a83e97dfdb3d8d1a085bf2db792.zip | |
Reduce 'android-18' duplication, as originally done by wenderen
Use android.platform (and $ANDROID_PLATFORM) for configuration, apply 'android-18' default
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 3 |
1 files changed, 3 insertions, 0 deletions
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"]: |