Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 15:18:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Reduce duplication in binary path determinition for Android target (fixes issue #8349)

Browse source
This commit is contained in:
Yanir Seroussi 2015-11-19 14:35:10 +11:00
parent a5babb89a0
commit 4b71bc5c42
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python/servo/command_base.py
View file

@ -113,6 +113,7 @@ class CommandBase(object):
self.config["android"].setdefault("sdk", "")
self.config["android"].setdefault("ndk", "")
self.config["android"].setdefault("toolchain", "")
self.config["android"].setdefault("target", "arm-linux-androideabi")
self.config.setdefault("gonk", {})
self.config["gonk"].setdefault("b2g", "")
@ -145,8 +146,10 @@ class CommandBase(object):
else:
return path.join(self.context.topdir, "target")
def get_binary_path(self, release, dev):
def get_binary_path(self, release, dev, android=False):
base_path = self.get_target_dir()
if android:
base_path = path.join(base_path, self.config["android"]["target"])
release_path = path.join(base_path, "release", "servo")
dev_path = path.join(base_path, "debug", "servo")