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

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

Issue 2329943004: Mark infra steps as infra_step in GN recipe flavors. (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « infra/bots/recipe_modules/flavor/gn_android_flavor.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61b12a1262c46df9031befc95ec0a7abb1764f47..bef577926d4cd02445cc72a8b4102b4725d3d142 100644
--- a/infra/bots/recipe_modules/flavor/gn_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_flavor.py
@@ -16,11 +16,12 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
extra_config.startswith('SK')
])
- def _run(self, title, cmd, env=None):
+ def _run(self, title, cmd, env=None, infra_step=False):
self.m.vars.default_env = {k: v for (k,v)
in self.m.vars.default_env.iteritems()
if k in ['PATH']}
- self.m.run(self.m.step, title, cmd=cmd, env=env, cwd=self.m.vars.skia_dir)
+ self.m.run(self.m.step, title, cmd=cmd,
+ env=env, cwd=self.m.vars.skia_dir, infra_step=infra_step)
def compile(self, unused_target, **kwargs):
"""Build Skia with GN."""
@@ -70,7 +71,8 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils):
gn_args = ' '.join('%s=%s' % (k,v) for (k,v) in sorted(args.iteritems()))
- self._run('fetch-gn', [self.m.vars.skia_dir.join('bin', 'fetch-gn')])
+ self._run('fetch-gn', [self.m.vars.skia_dir.join('bin', 'fetch-gn')],
+ infra_step=True)
self._run('gn gen', ['gn', 'gen', self.out_dir, '--args=' + gn_args])
self._run('ninja', ['ninja', '-C', self.out_dir])
« no previous file with comments | « infra/bots/recipe_modules/flavor/gn_android_flavor.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698