aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/command_base.py
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-11-15 15:34:37 -0500
committerGitHub <noreply@github.com>2018-11-15 15:34:37 -0500
commit4620f0b8c8115b5fa808c815bb17fe727a6c15dd (patch)
tree4ce48c92c36baf71e38fc27a0990365bfcc2b475 /python/servo/command_base.py
parentb8281b437417cacfc403d87aff859705fe998124 (diff)
parentef2c2f933b686792872983fa0f80209f91bdc851 (diff)
downloadservo-4620f0b8c8115b5fa808c815bb17fe727a6c15dd.tar.gz
servo-4620f0b8c8115b5fa808c815bb17fe727a6c15dd.zip
Auto merge of #22180 - asajeffrey:magicleap-nightly, r=jdm
Package and release the Servo magicleap app <!-- Please describe your changes on the following line: --> Package the Magic Leap Servo2D app, and build and release it nightly. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes do not require tests because we don't test ML <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/22180) <!-- Reviewable:end -->
Diffstat (limited to 'python/servo/command_base.py')
-rw-r--r--python/servo/command_base.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 3770de6c9cd..e44336c39d1 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -353,14 +353,17 @@ class CommandBase(object):
def get_gstreamer_path(self):
return path.join(self.context.topdir, "support", "linux", "gstreamer", "gstreamer")
- def get_binary_path(self, release, dev, android=False):
+ def get_binary_path(self, release, dev, android=False, magicleap=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:
+ if magicleap:
+ base_path = path.join(base_path, "aarch64-linux-android")
+ binary_name = "libmlservo.a"
+ elif android:
base_path = path.join(base_path, self.config["android"]["target"])
binary_name = "libsimpleservo.so"