diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-05-28 19:06:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 19:06:03 -0400 |
| commit | 84ec1316c90a29f07c60e10f78ba4d9f3185bef8 (patch) | |
| tree | 51612bcec9aa28ccace37dedb6eea09486a06c6a | |
| parent | e394c71230b282e2526751cfa3ca9cf507168b6a (diff) | |
| parent | 06745fcb9f529562a92805e5a8e9027e2016b116 (diff) | |
| download | servo-84ec1316c90a29f07c60e10f78ba4d9f3185bef8.tar.gz servo-84ec1316c90a29f07c60e10f78ba4d9f3185bef8.zip | |
Auto merge of #23471 - asajeffrey:mlsdkup, r=jdm
Update magicleap SDK to v0.20.0+ndk19c
<!-- Please describe your changes on the following line: -->
Updates the magicleap SDK to our (hopefully temporary) frankensdk.
---
<!-- 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 fix #23458
- [X] These changes do not require tests because this fixes build issues
<!-- 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/23471)
<!-- Reviewable:end -->
| -rw-r--r-- | etc/taskcluster/decision_task.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index c81c29da104..bbe797bc4f0 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -815,8 +815,8 @@ def magicleap_build_task(name, build_type): macos_build_task(name) .with_treeherder("MagicLeap aarch64", build_type) .with_directory_mount( - "https://servo-deps.s3.amazonaws.com/magicleap/macos-sdk-v0.17.0.tar.gz", - sha256="e81de47ad963891ac68768d93ab5a36ed3af3a3efebb4dbc4db2e65647d57655", + "https://servo-deps.s3.amazonaws.com/magicleap/macos-sdk-v0.20.0%2Bndk19c.tar.gz", + sha256="d5890cc7612694d79e60247a5d5fe4d8bdeb797095f098d56f3069be33426781", path="magicleap" ) .with_directory_mount( @@ -826,7 +826,7 @@ def magicleap_build_task(name, build_type): ) # Early script in order to run with the initial $PWD .with_early_script(""" - export MAGICLEAP_SDK="$PWD/magicleap/v0.17.0" + export MAGICLEAP_SDK="$PWD/magicleap/v0.20.0+ndk19c" export MLCERT="$PWD/magicleap/TempSharedCert.cert" """) .with_script(""" |