aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/command_base.py
diff options
context:
space:
mode:
authorPaul Rouget <me@paulrouget.com>2018-12-12 03:28:32 +0100
committerPaul Rouget <me@paulrouget.com>2018-12-28 09:35:23 +0100
commit16a00a107f83e12b5138385cc77456967c09f251 (patch)
tree1160fa38d1ef38be7e561b1f3e6fe505e05f3a62 /python/servo/command_base.py
parent44344452e21fb86e681cda8407dc15f19b05db25 (diff)
downloadservo-16a00a107f83e12b5138385cc77456967c09f251.tar.gz
servo-16a00a107f83e12b5138385cc77456967c09f251.zip
Split simpleservo into 3 crates for rust, c and jni apis
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r--python/servo/command_base.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 6c193191fb0..393808213a6 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -716,7 +716,7 @@ install them, let us know by filing a bug!")
def add_manifest_path(self, args, android=False, libsimpleservo=False):
if "--manifest-path" not in args:
if libsimpleservo or android:
- manifest = self.ports_libsimpleservo_manifest()
+ manifest = self.ports_libsimpleservo_manifest(android)
else:
manifest = self.ports_servo_manifest()
args.append("--manifest-path")
@@ -725,8 +725,12 @@ install them, let us know by filing a bug!")
def ports_servo_manifest(self):
return path.join(self.context.topdir, "ports", "servo", "Cargo.toml")
- def ports_libsimpleservo_manifest(self):
- return path.join(self.context.topdir, "ports", "libsimpleservo", "Cargo.toml")
+ def ports_libsimpleservo_manifest(self, android=False):
+ if android:
+ api = "jniapi"
+ else:
+ api = "capi"
+ return path.join(self.context.topdir, "ports", "libsimpleservo", api, "Cargo.toml")
def servo_features(self):
"""Return a list of optional features to enable for the Servo crate"""