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

Unified Diff: infra/bots/recipe_modules/flavor/gn_flavor.py

Issue 2209423002: [recipes] Remove build environment vars from default_env (Closed) Base URL: https://skia.googlesource.com/skia.git@merge_buildbot_spec_fix_coverage
Patch Set: [recipes] Remove build environment vars from default_env Created 4 years, 4 months 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
Index: infra/bots/recipe_modules/flavor/gn_flavor.py
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py
index ea5bbb69349d8332fbcb84d7a03ea1688eb13503..019967748b5a4bff39d45e9c783f1c789a17bd7c 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -6,13 +6,14 @@ import default_flavor
"""GN flavor utils, used for building Skia with GN."""
class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
- def compile(self, target):
+ def compile(self, target, **kwargs):
"""Build Skia with GN."""
# Get the gn executable.
fetch_gn = self.m.vars.skia_dir.join('bin', 'fetch-gn')
self.m.run(self.m.step, 'fetch-gn',
cmd=[fetch_gn],
- cwd=self.m.vars.skia_dir)
+ cwd=self.m.vars.skia_dir,
+ **kwargs)
is_debug = 'is_debug=true'
if self.m.vars.configuration != 'Debug':
@@ -44,10 +45,11 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
gn_exe = 'gn.exe'
gn_gen = [gn_exe, 'gen', self.out_dir, '--args=%s' % ' '.join(gn_args)]
self.m.run(self.m.step, 'gn_gen', cmd=gn_gen,
- cwd=self.m.vars.skia_dir)
+ cwd=self.m.vars.skia_dir, **kwargs)
# Run ninja.
ninja_cmd = ['ninja', '-C', self.out_dir]
self.m.run(self.m.step, 'compile %s' % target,
cmd=ninja_cmd,
- cwd=self.m.vars.skia_dir)
+ cwd=self.m.vars.skia_dir,
+ **kwargs)

Powered by Google App Engine
This is Rietveld 408576698