diff options
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 2af5fcd63c1..32c6b2538c9 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -140,6 +140,18 @@ class CommandBase(object): if self.config["android"]["toolchain"]: env["ANDROID_TOOLCHAIN"] = self.config["android"]["toolchain"] + # FIXME: These are set because they are the variable names that + # android-rs-glue expects. However, other submodules have makefiles that + # reference the env var names above. Once glutin is enabled and set as + # the default, we could modify the subproject makefiles to use the names + # below and remove the vars above, to avoid duplication. + if "ANDROID_SDK" in env: + env["ANDROID_HOME"] = env["ANDROID_SDK"] + if "ANDROID_NDK" in env: + env["NDK_HOME"] = env["ANDROID_NDK"] + if "ANDROID_TOOLCHAIN" in env: + env["NDK_STANDALONE"] = env["ANDROID_TOOLCHAIN"] + return env def servo_crate(self): |