diff options
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 42b09b59ced..9abd2e05218 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -212,6 +212,11 @@ class MachCommands(CommandBase): print("Please specify either --target or --android.") sys.exit(1) + # https://github.com/servo/servo/issues/22069 + if debug_mozjs and magicleap: + print("Please specify either --debug-mozjs or --magicleap.") + sys.exit(1) + if android: target = self.config["android"]["target"] @@ -442,7 +447,7 @@ class MachCommands(CommandBase): # Build the name of the package containing all GStreamer dependencies # according to the build target. gst_lib = "gst-build-{}".format(self.config["android"]["lib"]) - gst_lib_zip = "gstreamer-{}-1.14.3-20181105-103937.zip".format(self.config["android"]["lib"]) + gst_lib_zip = "gstreamer-{}-1.14.3-20190131-153818.zip".format(self.config["android"]["lib"]) gst_dir = os.path.join(target_path, "gstreamer") gst_lib_path = os.path.join(gst_dir, gst_lib) pkg_config_path = os.path.join(gst_lib_path, "pkgconfig") @@ -722,6 +727,11 @@ class MachCommands(CommandBase): def clean(self, manifest_path=None, params=[], verbose=False): self.ensure_bootstrapped() + virtualenv_path = path.join(self.get_top_dir(), 'python', '_virtualenv') + if path.exists(virtualenv_path): + print('Removing virtualenv directory: %s' % virtualenv_path) + shutil.rmtree(virtualenv_path) + opts = [] if manifest_path: opts += ["--manifest-path", manifest_path] |