diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-06-11 17:21:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 17:21:36 -0400 |
| commit | 8e783577d24cac2983fbea1b46d5452ffa5fb44f (patch) | |
| tree | 5b54b12b1949e65edf738e185b4fc3ad0fa73ae2 /python/servo/command_base.py | |
| parent | f63b404e0cbf30380c4043700861110d06e548bb (diff) | |
| parent | e9365ad3037802ce44d2e1371f37d3707f570777 (diff) | |
| download | servo-8e783577d24cac2983fbea1b46d5452ffa5fb44f.tar.gz servo-8e783577d24cac2983fbea1b46d5452ffa5fb44f.zip | |
Auto merge of #23468 - servo:jdm-patch-52, r=asajeffrey
Add Windows arm64 build.
Depends on:
* [x] https://github.com/servo/mozjs/pull/184
* [x] https://github.com/servo/rust-mozjs/pull/463
* [ ] <strike>https://github.com/servo/ipc-channel/pull/232</strike>
* [x] https://github.com/alexcrichton/cmake-rs/pull/82
* [x] https://github.com/servo/rust-offscreen-rendering-context/pull/136
* [x] https://github.com/servo/mozangle/pull/21
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23468)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 6313fff9bfe..d39576fe9c9 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -367,7 +367,7 @@ class CommandBase(object): def get_gstreamer_path(self): return path.join(self.context.topdir, "support", "linux", "gstreamer", "gst") - def get_binary_path(self, release, dev, target=None, android=False, magicleap=False): + def get_binary_path(self, release, dev, target=None, android=False, magicleap=False, simpleservo=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() @@ -379,10 +379,13 @@ class CommandBase(object): binary_name = "libmlservo.a" elif android: base_path = path.join(base_path, "android", self.config["android"]["target"]) - binary_name = "libsimpleservo.so" + simpleservo = True elif target: base_path = path.join(base_path, target) + if simpleservo: + binary_name = "simpleservo.dll" if sys.platform == "win32" else "libsimpleservo.so" + release_path = path.join(base_path, "release", binary_name) dev_path = path.join(base_path, "debug", binary_name) |