Auto merge of #23976 - asajeffrey:magicleap-monompk, r=jdm

Package both Servo2D and Servo3D in one magicleap mpk

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

Put both magicleap apps in one mpk archive.

---
<!-- 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 we don't test native packaging

<!-- 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/23976)
<!-- Reviewable:end -->

1 files changed, 3 insertions, 4 deletions

diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index a05e64ec8cf..e8505d2d30d 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -57,8 +57,7 @@ PACKAGES = {
         'target/release/brew/servo.tar.gz',
     ],
     'magicleap': [
-        'target/magicleap/aarch64-linux-android/release/Servo2D.mpk',
-        'target/magicleap/aarch64-linux-android/release/Servo3D.mpk',
+        'target/magicleap/aarch64-linux-android/release/Servo.mpk',
     ],
     'maven': [
         'target/android/gradle/servoview/maven/org/mozilla/servoview/servoview-armv7/',
@@ -237,8 +236,7 @@ class PackageCommands(CommandBase):
 
             mabu = path.join(env.get("MAGICLEAP_SDK"), "mabu")
             packages = [
-                "./support/magicleap/Servo3D/Servo3D.package",
-                "./support/magicleap/Servo2D/Servo2D.package",
+                "./support/magicleap/Servo.package",
             ]
             if dev:
                 build_type = "lumin_debug"
@@ -249,6 +247,7 @@ class PackageCommands(CommandBase):
                     mabu,
                     "-o", target_dir,
                     "-t", build_type,
+                    "-r",
                     "GSTREAMER_DIR=" + env["GSTREAMER_DIR"],
                     package
                 ]