diff options
| author | Alan Jeffrey <ajeffrey@mozilla.com> | 2019-04-25 12:54:09 -0500 |
|---|---|---|
| committer | Alan Jeffrey <ajeffrey@mozilla.com> | 2019-06-13 15:04:05 -0500 |
| commit | 0b48ff496fc42dfff1ed7a3a3b15b78470a49c39 (patch) | |
| tree | 2378af0aa6ce365ef1b353b7ed2b750e5b418374 /python | |
| parent | e381cebeb6cb9dbf7ca5555bcd40f427470e353a (diff) | |
| download | servo-0b48ff496fc42dfff1ed7a3a3b15b78470a49c39.tar.gz servo-0b48ff496fc42dfff1ed7a3a3b15b78470a49c39.zip | |
Add Servo3D immersive demo for magicleap
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/package_commands.py | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 491abf2eb84..98ad57eee4b 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -58,6 +58,7 @@ PACKAGES = { ], 'magicleap': [ 'target/magicleap/aarch64-linux-android/release/Servo2D.mpk', + 'target/magicleap/aarch64-linux-android/release/Servo3D.mpk', ], 'maven': [ 'target/android/gradle/servoview/maven/org/mozilla/servoview/servoview-armv7/', @@ -230,22 +231,26 @@ class PackageCommands(CommandBase): if not env.get("MLCERT"): raise Exception("Magic Leap builds need the MLCERT environment variable") mabu = path.join(env.get("MAGICLEAP_SDK"), "mabu") - package = "./support/magicleap/Servo2D/Servo2D.package" + packages = [ + "./support/magicleap/Servo3D/Servo3D.package", + "./support/magicleap/Servo2D/Servo2D.package", + ] if dev: build_type = "lumin_debug" else: build_type = "lumin_release" - argv = [ - mabu, - "-o", target_dir, - "-t", build_type, - package - ] - try: - subprocess.check_call(argv, env=env) - except subprocess.CalledProcessError as e: - print("Packaging Magic Leap exited with return value %d" % e.returncode) - return e.returncode + for package in packages: + argv = [ + mabu, + "-o", target_dir, + "-t", build_type, + package + ] + try: + subprocess.check_call(argv, env=env) + except subprocess.CalledProcessError as e: + print("Packaging Magic Leap exited with return value %d" % e.returncode) + return e.returncode elif android: android_target = self.config["android"]["target"] if "aarch64" in android_target: |