diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-03-27 14:28:04 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-27 14:28:04 -0400 |
commit | cd8b9cab22ba375628b9f47ed0b589397817e145 (patch) | |
tree | 57ac928da3a4abe70df6f70b0a41ef7a15891b39 /python/servo/package_commands.py | |
parent | 864f855850093f9d69f76376a79180a22ee4ad11 (diff) | |
parent | 733ff9512c79ac10a4d219050621a4e1264fce43 (diff) | |
download | servo-cd8b9cab22ba375628b9f47ed0b589397817e145.tar.gz servo-cd8b9cab22ba375628b9f47ed0b589397817e145.zip |
Auto merge of #23117 - asajeffrey:mach-magicleap-package-target, r=jdm
Set the target when packaging for magicleap
<!-- Please describe your changes on the following line: -->
If we don't set the target during packaging, we get errors checking for gstreamer.
---
<!-- 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 it fixes packaging errors.
<!-- 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/23117)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/package_commands.py')
-rw-r--r-- | python/servo/package_commands.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 83f308f1816..ac27eeda68b 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -212,6 +212,11 @@ class PackageCommands(CommandBase): android = self.handle_android_target(target) else: target = self.config["android"]["target"] + if target and magicleap: + print("Please specify either --target or --magicleap.") + sys.exit(1) + if magicleap: + target = "aarch64-linux-android" env = self.build_env(target=target) binary_path = self.get_binary_path(release, dev, android=android, magicleap=magicleap) dir_to_root = self.get_top_dir() |