Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23471 - asajeffrey:mlsdkup, r=jdm

Browse source 
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 -->
This commit is contained in:
bors-servo 2019-05-28 19:06:03 -04:00 • committed by GitHub
commit 84ec1316c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
etc/taskcluster/decision_task.py
View file

@ -815,8 +815,8 @@ def magicleap_build_task(name, build_type):
macos_build_task(name) macos_build_task(name)
.with_treeherder("MagicLeap aarch64", build_type) .with_treeherder("MagicLeap aarch64", build_type)
.with_directory_mount( .with_directory_mount(
"https://servo-deps.s3.amazonaws.com/magicleap/macos-sdk-v0.17.0.tar.gz", "https://servo-deps.s3.amazonaws.com/magicleap/macos-sdk-v0.20.0%2Bndk19c.tar.gz",
sha256="e81de47ad963891ac68768d93ab5a36ed3af3a3efebb4dbc4db2e65647d57655", sha256="d5890cc7612694d79e60247a5d5fe4d8bdeb797095f098d56f3069be33426781",
path="magicleap" path="magicleap"
) )
.with_directory_mount( .with_directory_mount(
@ -826,7 +826,7 @@ def magicleap_build_task(name, build_type):
) )
# Early script in order to run with the initial $PWD # Early script in order to run with the initial $PWD
.with_early_script(""" .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" export MLCERT="$PWD/magicleap/TempSharedCert.cert"
""") """)
.with_script(""" .with_script("""