mirror of
https://github.com/servo/servo.git
synced 2025-06-29 19:43:39 +01:00
new android port: fix android build and tests
This commit is contained in:
parent
76d394eca8
commit
bef2fe83cd
9 changed files with 43 additions and 39 deletions
|
@ -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):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue