diff options
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 3a755c7e106..72810efff0d 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -73,6 +73,14 @@ class CommandBase(object): self.config["tools"]["cargo-root"] = path.join( context.topdir, "cargo") + self.config.setdefault("build", {}) + self.config["build"].setdefault("android", False) + + self.config.setdefault("android", {}) + self.config["android"].setdefault("sdk", "") + self.config["android"].setdefault("ndk", "") + self.config["android"].setdefault("toolchain", "") + _rust_snapshot_path = None def rust_snapshot_path(self): @@ -111,6 +119,14 @@ class CommandBase(object): os.pathsep, env.get("LD_LIBRARY_PATH", "")) + # Paths to Android build tools: + if self.config["android"]["sdk"]: + env["ANDROID_SDK"] = self.config["android"]["sdk"] + if self.config["android"]["ndk"]: + env["ANDROID_NDK"] = self.config["android"]["ndk"] + if self.config["android"]["toolchain"]: + env["ANDROID_TOOLCHAIN"] = self.config["android"]["toolchain"] + return env def ensure_bootstrapped(self): |