aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/platform/base.py
diff options
context:
space:
mode:
authorTHARAK HEGDE <120558797+captainhaddock18@users.noreply.github.com>2023-07-05 22:12:25 +0530
committerGitHub <noreply@github.com>2023-07-05 22:12:25 +0530
commitdbafb2f2d1a39f28498e05e13c26848a99fd5a54 (patch)
tree2b711210a92771803ff7dca295a8e22a986dc528 /python/servo/platform/base.py
parent67fc6fed9e66c49aed2eb52801712c849e40e5bf (diff)
parentf11c6045e33a921f03223c313781586189309bd2 (diff)
downloadservo-dbafb2f2d1a39f28498e05e13c26848a99fd5a54.tar.gz
servo-dbafb2f2d1a39f28498e05e13c26848a99fd5a54.zip
Merge branch 'servo:master' into master
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