diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2019-09-04 13:15:13 -0700 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2019-09-04 13:37:17 -0700 |
commit | 92bddf081da57da55c575afbcb166a26e7954f72 (patch) | |
tree | 8e3771646598c4c0fd7dc92c8ea7f4f40bec16b0 /python/servo/build_commands.py | |
parent | 068997cd30be6f2988f4b89ab39995aa3266cc39 (diff) | |
download | servo-92bddf081da57da55c575afbcb166a26e7954f72.tar.gz servo-92bddf081da57da55c575afbcb166a26e7954f72.zip |
Use OpenXR Loader from NuGet
Diffstat (limited to 'python/servo/build_commands.py')
-rw-r--r-- | python/servo/build_commands.py | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index d94513889c9..4a268d2d713 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -693,12 +693,6 @@ 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): @@ -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 = { |