Auto merge of servo#29956 - mrobinson:update-mozangle, r=jdm

Update mozangle

This should allow servo to take advantage of faster compilation times on Windows.

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Author: bors-servo

Cargo.lock

@@ -48,6 +48,7 @@ malloc_size_of_derive = "0.1"
 mime = "0.3.13"
 mime_guess = "2.0.3"
 mitochondria = "1.1.2"
+mozangle = "0.3"
 num-traits = "0.2"
 parking_lot = "0.11"
 percent-encoding = "2.0"

Cargo.toml

@@ -122,4 +122,4 @@ webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
 xml5ever = { workspace = true }
 
 [target.'cfg(not(target_os = "ios"))'.dependencies]
-mozangle = { version = "0.3", features = ["egl", "build_dlls"] }
+mozangle = { workspace = true }

components/script/Cargo.toml

@@ -13,7 +13,6 @@ crate-type = ["rlib"]
 
 [features]
 debugmozjs = ["script/debugmozjs"]
-egl = ["mozangle/egl"]
 googlevr = ["webxr/googlevr"]
 jitspew = ["script/jitspew"]
 js_backtrace = ["script/js_backtrace"]
@@ -61,6 +60,7 @@ layout_thread_2013 = { path = "../layout_thread", optional = true }
 layout_thread_2020 = { path = "../layout_thread_2020", optional = true }
 log = { workspace = true }
 media = { path = "../media" }
+mozangle = { workspace = true }
 msg = { path = "../msg" }
 net = { path = "../net" }
 net_traits = { path = "../net_traits" }
@@ -92,4 +92,4 @@ webxr-api = { git = "https://github.com/servo/webxr" }
 gaol = "0.2.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-mozangle = { version = "0.3", features = ["egl", "build_dlls"] }
+mozangle = { workspace = true, features = ["egl", "build_dlls"] }

components/servo/Cargo.toml

@@ -35,7 +35,6 @@ serde_json = { workspace = true }
 [features]
 debugmozjs = ["libservo/debugmozjs"]
 default = ["webdriver", "max_log_level"]
-egl = ["libservo/egl"]
 googlevr = ["libservo/googlevr"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]

ports/libsimpleservo/api/Cargo.toml

@@ -31,7 +31,6 @@ cbindgen = "0.20"
 [features]
 debugmozjs = ["simpleservo/debugmozjs"]
 default = ["webdriver", "max_log_level"]
-egl = ["simpleservo/egl"]
 googlevr = ["simpleservo/googlevr"]
 jitspew = ["simpleservo/jitspew"]
 js_backtrace = ["simpleservo/js_backtrace"]

ports/libsimpleservo/capi/Cargo.toml

@@ -29,7 +29,6 @@ cc = "1.0"
 [features]
 debugmozjs = ["simpleservo/debugmozjs"]
 default = ["webdriver", "max_log_level"]
-egl = ["simpleservo/egl"]
 googlevr = ["simpleservo/googlevr"]
 js_backtrace = ["simpleservo/js_backtrace"]
 layout-2013 = ["simpleservo/layout-2013"]

ports/libsimpleservo/jniapi/Cargo.toml

@@ -28,7 +28,6 @@ ProductName = "Servo"
 [features]
 debugmozjs = ["libservo/debugmozjs"]
 default = ["webdriver", "max_log_level"]
-egl = ["libservo/egl"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]
 layout-2013 = ["libservo/layout-2013"]

ports/winit/Cargo.toml

@@ -833,9 +833,7 @@ def run_cargo_build_like_command(
             if self.is_uwp_build:
                 features.append("no-wgl")
                 features.append("uwp")
-            else:
-                # Non-UWP builds provide their own libEGL via mozangle.
-                features.append("egl")
+
             if with_layout_2020 or (self.config["build"]["layout-2020"] and not with_layout_2013):
                 features.append("layout-2020")
             elif "layout-2020" not in features: