Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1773642 - Adjust openbsd webrtc config after bug 1661450. r=mjf

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D148891
This commit is contained in:
Mike Hommey 2022-06-14 04:19:03 +00:00
parent 1210cf37c8
commit 1527794ac9
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/gn.mozbuild
View File

@ -13,11 +13,11 @@ else:
os = CONFIG['OS_TARGET']
if os == "Linux":
if CONFIG['MOZ_X11']:
gn_vars['use_x11'] = True
else:
gn_vars['use_x11'] = False
if CONFIG['MOZ_X11']:
gn_vars['use_x11'] = True
elif os == "Linux":
# Only set use_x11 explicitly to false on Linux for no-x11 variants
gn_vars['use_x11'] = False
flavors = {
'WINNT': 'win',

8
python/mozbuild/mozbuild/gn_processor.py
View File

@ -583,8 +583,14 @@ def generate_gn_config(
gn_args = "--args=%s" % " ".join(
["%s=%s" % (k, str_for_arg(v)) for k, v in six.iteritems(input_variables)]
)
# Don't make use_x11 part of the string for openbsd to avoid creating
# new json files.
gn_arg_string = "_".join(
[str(input_variables[k]) for k in sorted(input_variables.keys())]
[
str(input_variables[k])
for k in sorted(input_variables.keys())
if k != "use_x11" or input_variables["target_os"] != "openbsd"
]
)
out_dir = mozpath.join(output, "gn-output")
gen_args = [config.substs["GN"], "gen", out_dir, gn_args, "--ide=json"]