Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: tools/build.py

Issue 2599673004: Revert "GN: Make GN the default" (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/bots/gn_build.py ('k') | tools/generate_buildfiles.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/build.py
diff --git a/tools/build.py b/tools/build.py
index 448b47e4599d5965ffaccc11bb1375bd46655d91..5b665003489ccb35043458850d938be41b8f280b 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -44,11 +44,11 @@ the Dart repo root,
unless you really intend to use a non-default Makefile.""" % DART_ROOT
-DART_USE_GYP = "DART_USE_GYP"
+DART_USE_GN = "DART_USE_GN"
-def use_gyp():
- return DART_USE_GYP in os.environ
+def use_gn():
+ return DART_USE_GN in os.environ
def BuildOptions():
@@ -84,9 +84,9 @@ def BuildOptions():
help='Name of the devenv.com/msbuild executable on Windows (varies for '
'different versions of Visual Studio)',
default=vs_executable)
- result.add_option("--gyp",
- help='Build with gyp.',
- default=use_gyp(),
+ result.add_option("--gn",
+ help='Build with GN/Ninja',
+ default=use_gn(),
action='store_true')
return result
@@ -435,7 +435,7 @@ def BuildNinjaCommand(options, target, target_os, mode, arch):
if options.verbose:
command += ['-v']
if UseGoma(out_dir):
- command += ['-j1000']
+ command += ['-j200']
command += [target]
return command
@@ -446,7 +446,7 @@ def BuildOneConfig(options, target, target_os, mode, arch, override_tools):
start_time = time.time()
args = []
build_config = utils.GetBuildConf(mode, arch, target_os)
- if not options.gyp:
+ if options.gn:
args = BuildNinjaCommand(options, target, target_os, mode, arch)
else:
os.environ['DART_BUILD_MODE'] = mode
« no previous file with comments | « tools/bots/gn_build.py ('k') | tools/generate_buildfiles.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698