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

new android port: fix android build and tests

Browse Source
This commit is contained in:
Paul Rouget
2018-07-31 22:38:54 +08:00
parent 76d394eca8
commit bef2fe83cd
9 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
python/servo/command_base.py
View File

@@ -330,15 +330,24 @@ class CommandBase(object):
else:
return path.join(self.context.topdir, "target")
def get_apk_path(self, release):
base_path = self.get_target_dir()
base_path = path.join(base_path, self.config["android"]["target"])
apk_name = "servo.apk"
build_type = "release" if release else "debug"
return path.join(base_path, build_type, apk_name)
def get_binary_path(self, release, dev, android=False):
# TODO(autrilla): this function could still use work - it shouldn't
# handle quitting, or printing. It should return the path, or an error.
base_path = self.get_target_dir()
binary_name = "servo" + BIN_SUFFIX
if android:
base_path = path.join(base_path, self.config["android"]["target"])
binary_name = "libsimpleservo.so"
binary_name = "servo" + BIN_SUFFIX
release_path = path.join(base_path, "release", binary_name)
dev_path = path.join(base_path, "debug", binary_name)
@@ -594,10 +603,10 @@ class CommandBase(object):
return env
def servo_crate(self):
def ports_servo_crate(self):
return path.join(self.context.topdir, "ports", "servo")
def servo_manifest(self):
def ports_servo_manifest(self):
return path.join(self.context.topdir, "ports", "servo", "Cargo.toml")
def servo_features(self):