aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/platform/base.py
diff options
context:
space:
mode:
authorbors-servo <infra@servo.org>2023-07-05 17:12:48 +0200
committerGitHub <noreply@github.com>2023-07-05 17:12:48 +0200
commitf11c6045e33a921f03223c313781586189309bd2 (patch)
tree3ba49043d572dee4cafcd3064865026ff496fb96 /python/servo/platform/base.py
parenteebb0a57468f20ec9e57e842ba1fc4a0d6c6598e (diff)
parentc58d74fe62ce1b82f2d5a193f4f02bb20a7c402e (diff)
downloadservo-f11c6045e33a921f03223c313781586189309bd2.tar.gz
servo-f11c6045e33a921f03223c313781586189309bd2.zip
Auto merge of #29970 - mrobinson:remove-uwp, r=jdm
Remove UWP / Hololens support <!-- 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 - [x] These changes do not require tests because they remove a feature. <!-- 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. -->
Diffstat (limited to 'python/servo/platform/base.py')
-rw-r--r--python/servo/platform/base.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/python/servo/platform/base.py b/python/servo/platform/base.py
index 65731ba0364..a1bce7e3bb8 100644
--- a/python/servo/platform/base.py
+++ b/python/servo/platform/base.py
@@ -25,14 +25,9 @@ class Base:
def set_gstreamer_environment_variables_if_necessary(
self, env: Dict[str, str], cross_compilation_target: Optional[str], check_installation=True
):
- # Environment variables are not needed when cross-compiling on any
- # platform other than Windows. UWP doesn't support GStreamer. GStreamer
- # for Android is handled elsewhere.
- if cross_compilation_target and (
- not self.is_windows
- or "uwp" in cross_compilation_target
- or "android" in cross_compilation_target
- ):
+ # Environment variables are not needed when cross-compiling on any platform other
+ # than Windows. GStreamer for Android is handled elsewhere.
+ if cross_compilation_target and (not self.is_windows or "android" in cross_compilation_target):
return
# We may not need to update environment variables if GStreamer is installed