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 = {
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj
index 1f14220c899..b72e48c08ef 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj
+++ b/support/hololens/ServoApp/ServoApp.vcxproj
@@ -1,5 +1,6 @@
+
true
@@ -316,9 +317,7 @@
true
-
- true
-
+
true
@@ -499,9 +498,6 @@
true
-
- true
-
true
@@ -708,13 +704,6 @@
true
false
-
- true
- true
- false
- true
- false
-
true
true
@@ -742,9 +731,6 @@
true
-
- true
-
true
@@ -978,6 +964,7 @@
+
@@ -986,5 +973,7 @@
+
+
diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters
index 59c46ee463b..286b7c5fcd6 100644
--- a/support/hololens/ServoApp/ServoApp.vcxproj.filters
+++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters
@@ -67,9 +67,6 @@
-
- DebugServoDLLs
-
DebugServoDLLs
@@ -82,18 +79,12 @@
DebugServoDLLs
-
- ReleaseServoDLLs
-
ReleaseServoDLLs
ReleaseServoDLLs
-
- DebugARM64ServoDLLs
-
DebugARM64ServoDLLs
@@ -103,9 +94,6 @@
DebugARM64ServoDLLs
-
- ReleaseARM64ServoDLLs
-
ReleaseARM64ServoDLLs
@@ -838,4 +826,4 @@
-
+
\ No newline at end of file
diff --git a/support/hololens/ServoApp/packages.config b/support/hololens/ServoApp/packages.config
index 7270aa2d3dc..769e8e7db8f 100644
--- a/support/hololens/ServoApp/packages.config
+++ b/support/hololens/ServoApp/packages.config
@@ -2,4 +2,5 @@
+