From 82fcab38a4fe1c9037576e3319c7e633eccc3ac1 Mon Sep 17 00:00:00 2001
From: Alan Jeffrey <ajeffrey@mozilla.com>
Date: Thu, 25 Apr 2019 12:56:37 -0500
Subject: [PATCH 1/2] Move debuggable flag setting for magicleap package to
 package file

---
 python/servo/package_commands.py          | 3 ---
 support/magicleap/Servo2D/Servo2D.package | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index ac27eeda68b..94a30dfe421 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -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:
diff --git a/support/magicleap/Servo2D/Servo2D.package b/support/magicleap/Servo2D/Servo2D.package
index c8020d772ca..7d6f264e57f 100644
--- a/support/magicleap/Servo2D/Servo2D.package
+++ b/support/magicleap/Servo2D/Servo2D.package
@@ -4,4 +4,8 @@ USES =  "scenes"  "pipeline/cache/AssetManifest"
 DATAS = \
     fonts.xml : etc/fonts.xml
 
-REFS = Servo2D
\ No newline at end of file
+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

From 73a874f742a5243a70bd61fefe7a19b154a264e3 Mon Sep 17 00:00:00 2001
From: Alan Jeffrey <ajeffrey@mozilla.com>
Date: Thu, 25 Apr 2019 12:57:22 -0500
Subject: [PATCH 2/2] Work around deprecated API when packaging for magicleap

---
 support/magicleap/Servo2D/Servo2D.mabu | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/support/magicleap/Servo2D/Servo2D.mabu b/support/magicleap/Servo2D/Servo2D.mabu
index edb0ab3d9c9..60404f038ea 100644
--- a/support/magicleap/Servo2D/Servo2D.mabu
+++ b/support/magicleap/Servo2D/Servo2D.mabu
@@ -21,6 +21,10 @@ SHLIBS = \
     log \
     z
 
+# https://github.com/servo/servo/issues/23267
+CXXFLAGS = \
+    -Wno-deprecated
+
 USES = \
     lumin_runtime \
     code/srcsGen