Auto merge of #23268 - asajeffrey:magicleap-package-fixes, r=jdm

Magicleap package fixes

<!-- Please describe your changes on the following line: -->

A couple of fixes for magicleap packaging...
* Move the setting of the debuggable flag into the `.package` file where it belongs,
* Allow compiling with v0.20.0 of the SDK.

---
<!-- 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 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/23268)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-04-25 18:25:19 -04:00 committed by GitHub
commit 880f3b8b7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View file

@ -238,9 +238,6 @@ class PackageCommands(CommandBase):
mabu,
"-o", target_dir,
"-t", build_type,
# Servo SEGVs if we don't set the debuggable flag in the mpk's taildata
# https://github.com/servo/servo/issues/22188
"--add-tail-data-args=--debuggable",
package
]
try:

View file

@ -21,6 +21,10 @@ SHLIBS = \
log \
z
# https://github.com/servo/servo/issues/23267
CXXFLAGS = \
-Wno-deprecated
USES = \
lumin_runtime \
code/srcsGen

View file

@ -4,4 +4,8 @@ USES = "scenes" "pipeline/cache/AssetManifest"
DATAS = \
fonts.xml : etc/fonts.xml
REFS = Servo2D
REFS = Servo2D
# Servo SEGVs if we don't set the debuggable flag in the mpk's taildata
# https://github.com/servo/servo/issues/22188
OPTIONS=package/debuggable/on