eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-11 09:26:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use the bootstraped Android toolchains by default

Browse Source
This commit is contained in:
Simon Sapin
2018-06-28 16:32:46 +02:00
parent 65122b10d3
commit fc77db4b09
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/servo/command_base.py
View File

@@ -525,6 +525,16 @@ class CommandBase(object):
if self.config["android"]["platform"]:
env["ANDROID_PLATFORM"] = self.config["android"]["platform"]
toolchains = path.join(self.context.topdir, "android-toolchains")
for kind in ["sdk", "ndk"]:
default = os.path.join(toolchains, kind)
if os.path.isdir(default):
env.setdefault("ANDROID_" + kind.upper(), default)
tools = os.path.join(toolchains, "sdk", "platform-tools")
if os.path.isdir(tools):
env["PATH"] = "%s%s%s" % (tools, os.pathsep, env["PATH"])
# These are set because they are the variable names that build-apk
# expects. However, other submodules have makefiles that reference
# the env var names above. Once glutin is enabled and set as the