diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-09 17:53:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-09 17:53:53 -0500 |
commit | fa56fec21b9abbf1589de2c939192b13aeefe8eb (patch) | |
tree | 644c6f49a2cce0fd37412e1d74d005758149e665 /python/servo/build_commands.py | |
parent | ed0e6e1bb2f6ed7fd7b43b0ae935ce0e2b33016c (diff) | |
parent | 08270f07fcb670fa078a6ef49f0b047f8299c0ab (diff) | |
download | servo-fa56fec21b9abbf1589de2c939192b13aeefe8eb.tar.gz servo-fa56fec21b9abbf1589de2c939192b13aeefe8eb.zip |
Auto merge of #22150 - asajeffrey:magicleap-fix-ci-build, r=jdm
Fix the magicleap CI build
<!-- Please describe your changes on the following line: -->
This is a WIP PR to diagnose and fix the magicleap build in CI.
---
<!-- 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's fixing the build
<!-- 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/22150)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/build_commands.py')
-rw-r--r-- | python/servo/build_commands.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index ab9c769fb9f..b6b0a413026 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -248,10 +248,11 @@ class MachCommands(CommandBase): if android: target = self.config["android"]["target"] - if magicleap: - features += ["disable-native-bluetooth"] - if not target: - target = "aarch64-linux-android" + if not magicleap: + features += ["native-bluetooth"] + + if magicleap and not target: + target = "aarch64-linux-android" if target: if self.config["tools"]["use-rustup"]: |