Auto merge of #24140 - Manishearth:nuget-openxr, r=jdm

Use OpenXR loader from NuGet

No need to manually download the DLL

r? @jdm

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

1 files changed, 1 insertions, 30 deletions

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
index d94513889c9..5c5cacdc48f 100644
--- a/python/servo/build_commands.py
+++ b/python/servo/build_commands.py
@@ -693,19 +693,13 @@ class MachCommands(CommandBase):
                 if not package_gstreamer_dlls(env, servo_exe_dir, target_triple, uwp):
                     status = 1
 
-                if uwp:
-                    # copy needed openxr DLLs in to servo.exe dir
-                    print("Packaging openxr DLLs")
-                    if not self.package_openxr_dlls(env, servo_exe_dir, target_triple):
-                        status = 1
-
                 # UWP app packaging already bundles all required DLLs for us.
                 print("Packaging MSVC DLLs")
                 if not package_msvc_dlls(servo_exe_dir, target_triple, vcinstalldir, vs_version):
                     status = 1
 
                 # UWP build hololens
-                if uwp:
+                if uwp and status == 0:
                     build_uwp_hololens(target_triple, dev, msbuildinstalldir)
 
             elif sys.platform == "darwin":
@@ -753,29 +747,6 @@ class MachCommands(CommandBase):
         opts += params
         return check_call(["cargo", "clean"] + opts, env=self.build_env(), verbose=verbose)
 
-    def package_openxr_dlls(self, env, servo_exe_dir, target):
-        target_arch = target.split('-')[0]
-        if target_arch == "aarch64":
-            arch = "arm64"
-        elif target_arch == "x86_64":
-            arch = "x64"
-        else:
-            print("ERROR: We do not have openxr_loader DLLs for %s" % target_arch)
-            return False
-
-        # The package on S3 contains both debug and release DLLs, but
-        # by default we only use release DLLs. If you need to debug OpenXR itself,
-        # change this to Debug.
-        dll_path = os.path.join(self.msvc_package_dir("openxr-loader-uwp"), arch, "Release", "openxr_loader.dll")
-
-        try:
-            shutil.copy(dll_path, servo_exe_dir)
-        except:
-            print("ERROR: Could not find %s" % dll_path)
-            return False
-
-        return True
-
 
 def angle_root(target, nuget_env):
     arch = {