Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-26 16:50:23 +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

9
python/servo/post_build_commands.py
View file

@ -199,19 +199,18 @@ class PostBuildCommands(CommandBase):
help="Command-line arguments to be passed through to Servo")
def package(self, params, release=False, dev=False, debug=False, debugger=None):
env = self.build_env()
target_dir = path.join(self.get_target_dir(), "arm-linux-androideabi")
dev_flag = ""
binary_path = self.get_binary_path(release, dev, android=True)
if dev:
env["NDK_DEBUG"] = "1"
env["ANT_FLAVOR"] = "debug"
dev_flag = "-d"
target_dir = path.join(target_dir, "debug")
else:
env["ANT_FLAVOR"] = "release"
target_dir = path.join(target_dir, "release")
dev_flag = ""
output_apk = path.join(target_dir, "servo.apk")
target_dir = os.path.dirname(binary_path)
output_apk = "{}.apk".format(binary_path)
try:
with cd(path.join("support", "android", "build-apk")):
subprocess.check_call(["cargo", "run", "--", dev_flag, "-o", output_apk, "-t", target_dir,