2 files changed, 1 insertions, 27 deletions
diff --git a/python/servo/platform/base.py b/python/servo/platform/base.py
index 39d7ae5f293..1024ab6c28f 100644
--- a/python/servo/platform/base.py
+++ b/python/servo/platform/base.py
@@ -26,11 +26,6 @@ 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. 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
         # for the system on Linux.
         gstreamer_root = self.gstreamer_root(cross_compilation_target)
@@ -52,14 +47,6 @@ class Base:
             )
             env["GST_PLUGIN_SYSTEM_PATH"] = os.path.join(gstreamer_root, "lib", "gstreamer-1.0")
 
-        # If we are not cross-compiling GStreamer must be installed for the system. In
-        # the cross-compilation case, we might be picking it up from another directory.
-        if check_installation and not self.is_gstreamer_installed(cross_compilation_target):
-            raise FileNotFoundError(
-                "GStreamer libraries not found (>= version 1.18)."
-                "Please see installation instructions in README.md"
-            )
-
     def gstreamer_root(self, _cross_compilation_target: Optional[str]) -> Optional[str]:
         raise NotImplementedError("Do not know how to get GStreamer path for platform.")
 
diff --git a/python/servo/platform/linux.py b/python/servo/platform/linux.py
index 975b93e0a8d..b49e9018358 100644
--- a/python/servo/platform/linux.py
+++ b/python/servo/platform/linux.py
@@ -12,7 +12,6 @@ import subprocess
 from typing import Optional, Tuple
 
 import distro
-from .. import util
 from .base import Base
 
 # Please keep these in sync with the packages on the wiki, using the instructions below
@@ -75,8 +74,6 @@ XBPS_PKGS = ['libtool', 'gcc', 'libXi-devel', 'freetype-devel',
 
 GSTREAMER_URL = \
     "https://github.com/servo/servo-build-deps/releases/download/linux/gstreamer-1.16-x86_64-linux-gnu.20190515.tar.gz"
-PREPACKAGED_GSTREAMER_ROOT = \
-    os.path.join(util.get_target_dir(), "dependencies", "gstreamer")
 
 
 class Linux(Base):
@@ -154,7 +151,6 @@ class Linux(Base):
                                       f"{self.distro}, please file a bug")
 
         installed_something = self.install_non_gstreamer_dependencies(force)
-        installed_something |= self._platform_bootstrap_gstreamer(force)
         return installed_something
 
     def install_non_gstreamer_dependencies(self, force: bool) -> bool:
@@ -199,18 +195,9 @@ class Linux(Base):
         return True
 
     def gstreamer_root(self, cross_compilation_target: Optional[str]) -> Optional[str]:
-        if cross_compilation_target:
-            return None
-        if os.path.exists(PREPACKAGED_GSTREAMER_ROOT):
-            return PREPACKAGED_GSTREAMER_ROOT
-        # GStreamer might be installed system-wide, but we do not return a root in this
-        # case because we don't have to update environment variables.
         return None
 
-    def _platform_bootstrap_gstreamer(self, force: bool) -> bool:
-        if not force and self.is_gstreamer_installed(cross_compilation_target=None):
-            return False
-
+    def _platform_bootstrap_gstreamer(self, _force: bool) -> bool:
         raise EnvironmentError(
             "Bootstrapping GStreamer on Linux is not supported. "
             + "Please install it using your distribution package manager.")