diff --git a/tools/automate/automate-git.py b/tools/automate/automate-git.py index 30c861524..0e590001d 100644 --- a/tools/automate/automate-git.py +++ b/tools/automate/automate-git.py @@ -517,7 +517,14 @@ branch_is_2357_or_newer = (cef_branch == 'trunk' or int(cef_branch) >= 2357) # True if the requested branch is 2743 or older. branch_is_2743_or_older = (cef_branch != 'trunk' and int(cef_branch) <= 2743) -# Whether to use GN or GYP. GYP is currently the default. +# True if the requested branch is newer than 2785. +branch_is_newer_than_2785 = (cef_branch == 'trunk' or int(cef_branch) > 2785) + +# Enable GN by default for branches newer than 2785. +if branch_is_newer_than_2785 and not 'CEF_USE_GN' in os.environ.keys(): + os.environ['CEF_USE_GN'] = '1' + +# Whether to use GN or GYP. GYP is currently the default for older branches. use_gn = bool(int(os.environ.get('CEF_USE_GN', '0'))) if use_gn: if branch_is_2743_or_older: diff --git a/tools/gclient_hook.py b/tools/gclient_hook.py index a06919292..ee07ad01c 100644 --- a/tools/gclient_hook.py +++ b/tools/gclient_hook.py @@ -40,8 +40,8 @@ RunAction(cef_dir, patcher) print "\nGenerating CEF project files..." -# Whether to use GN or GYP. GYP is currently the default. -use_gn = bool(int(os.environ.get('CEF_USE_GN', '0'))) +# Whether to use GN or GYP. GN is currently the default. +use_gn = bool(int(os.environ.get('CEF_USE_GN', '1'))) gn_args = {} custom_toolchain = False diff --git a/tools/make_distrib.py b/tools/make_distrib.py index fbe81008c..5e61911c8 100644 --- a/tools/make_distrib.py +++ b/tools/make_distrib.py @@ -282,8 +282,8 @@ elif sys.platform == 'darwin': elif sys.platform.startswith('linux'): platform = 'linux' -# Whether to use GN or GYP. GYP is currently the default. -use_gn = bool(int(os.environ.get('CEF_USE_GN', '0'))) +# Whether to use GN or GYP. GN is currently the default. +use_gn = bool(int(os.environ.get('CEF_USE_GN', '1'))) # the outputdir option is required if options.outputdir is None: