Remove GStreamer dependencies from UWP app. Remove GStreamer backend …

…on Windows. It's impossible to conditionally use a crate based only on cargo features, so temporarily disable the backend on all Windows builds while we sort out how to get the UWP builds working again.
servo · Jul 31, 2019 · 8a10faf · 8a10faf
1 parent 6429fbe
commit 8a10faf
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 1,511 deletions.
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -85,10 +85,10 @@ webxr-api = {git = "https://github.com/servo/webxr"}
 [target.'cfg(all(not(target_os = "windows"), not(target_os = "ios"), not(target_os="android"), not(target_arch="arm"), not(target_arch="aarch64")))'.dependencies]
 gaol = {git = "https://github.com/servo/gaol"}
 
-[target.'cfg(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64", all(target_os = "windows", target_arch = "aarch64")))'.dependencies.servo-media-gstreamer]
+[target.'cfg(all(not(target_os = "windows"), any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64")))'.dependencies.servo-media-gstreamer]
 git = "https://github.com/servo/media"
 
-[target.'cfg(not(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64", all(target_os = "windows", target_arch = "aarch64"))))'.dependencies.servo-media-dummy]
+[target.'cfg(any(target_os = "windows", not(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64"))))'.dependencies.servo-media-dummy]
 git = "https://github.com/servo/media"
 
 [target.'cfg(target_os = "windows")'.dependencies]

diff --git a/components/servo/lib.rs b/components/servo/lib.rs
@@ -125,10 +125,12 @@ pub use msg::constellation_msg::TopLevelBrowsingContextId as BrowserId;
 pub use servo_config as config;
 pub use servo_url as url;
 
-#[cfg(any(
-    all(target_os = "android", target_arch = "arm"),
-    target_arch = "x86_64",
-    all(target_os = "windows", target_arch = "aarch64"),
+#[cfg(all(
+    not(target_os = "windows"),
+    any(
+        all(target_os = "android", target_arch = "arm"),
+        target_arch = "x86_64",
+    )
 ))]
 mod media_platform {
     use super::ServoMedia;
@@ -207,10 +209,12 @@ mod media_platform {
     }
 }
 
-#[cfg(not(any(
-    all(target_os = "android", target_arch = "arm"),
-    target_arch = "x86_64",
-    all(target_os = "windows", target_arch = "aarch64"),
+#[cfg(not(all(
+    not(target_os = "windows"),
+    any(
+        all(target_os = "android", target_arch = "arm"),
+        target_arch = "x86_64",
+    )
 )))]
 mod media_platform {
     use super::ServoMedia;

diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py
@@ -670,10 +670,9 @@ def package_generated_shared_libraries(libs, build_path, servo_exe_dir):
                     status = 1
 
                 # UWP app packaging already bundles all required DLLs for us.
-                if not uwp:
-                    print("Packaging MSVC DLLs")
-                    if not package_msvc_dlls(servo_exe_dir, target_triple, vcinstalldir, vs_version):
-                        status = 1
+                print("Packaging MSVC DLLs")
+                if not package_msvc_dlls(servo_exe_dir, target_triple, vcinstalldir, vs_version):
+                    status = 1
 
             elif sys.platform == "darwin":
                 # On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools