From 30143558b3d902f9e5f43f93179b6f17d17fcd5b Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Thu, 18 Feb 2021 23:36:14 -0500 Subject: Don't package gstreamer when it's disabled. --- python/servo/build_commands.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'python/servo/build_commands.py') diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 7095cfbcad4..11b53be6a89 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -193,7 +193,9 @@ class MachCommands(CommandBase): if not uwp: uwp = target and 'uwp' in target - features += self.pick_media_stack(media_stack, target) + media_stack = self.pick_media_stack(media_stack, target) + features += media_stack + has_media_stack = media_stack[0] == "media-gstreamer" target_path = base_path = self.get_target_dir() if android: @@ -726,9 +728,10 @@ class MachCommands(CommandBase): status = 1 # copy needed gstreamer DLLs in to servo.exe dir - print("Packaging gstreamer DLLs") - if not package_gstreamer_dlls(env, servo_exe_dir, target_triple, uwp): - status = 1 + if has_media_stack: + print("Packaging gstreamer DLLs") + if not package_gstreamer_dlls(env, servo_exe_dir, target_triple, uwp): + status = 1 # UWP app packaging already bundles all required DLLs for us. print("Packaging MSVC DLLs") @@ -741,7 +744,7 @@ class MachCommands(CommandBase): ) assert os.path.exists(servo_exe_dir) - if not package_gstreamer_dylibs(servo_exe_dir): + if has_media_stack and not package_gstreamer_dylibs(servo_exe_dir): return 1 # On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools -- cgit v1.2.3