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

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

Issue 2300173002: GN: expunge all environment variables that have no effect on GN (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 | « no previous file | infra/bots/recipe_modules/flavor/gn_flavor.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/bots/recipe_modules/flavor/gn_android_flavor.py
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index 9f3480a1a7f593012211aa128a835a1d4dad8526..12832ecc83ad88380d43dcabf034e5aedd4f2446 100644
--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
@@ -9,6 +9,11 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
def supported(self):
return 'GN_Android' == self.m.vars.builder_cfg.get('extra_config', '')
+ def _run(self, title, cmd):
+ path = self.m.vars.default_env['PATH']
+ self.m.vars.default_env = {'PATH': path}
+ self.m.run(self.m.step, title, cmd=cmd, cwd=self.m.vars.skia_dir, env={})
+
def compile(self, unused_target, **kwargs):
compiler = self.m.vars.builder_cfg.get('compiler')
configuration = self.m.vars.builder_cfg.get('configuration')
@@ -35,9 +40,6 @@ class GNAndroidFlavorUtils(default_flavor.DefaultFlavorUtils):
'target_cpu': quote(target_arch),
}.iteritems()))
- run = lambda title, cmd: self.m.run(self.m.step, title, cmd=cmd,
- cwd=self.m.vars.skia_dir, **kwargs)
-
- run('fetch-gn', [self.m.vars.skia_dir.join('bin', 'fetch-gn')])
- run('gn gen', ['gn', 'gen', self.out_dir, '--args=' + gn_args])
- run('ninja', ['ninja', '-C', self.out_dir])
+ self._run('fetch-gn', [self.m.vars.skia_dir.join('bin', 'fetch-gn')])
+ 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 | « no previous file | infra/bots/recipe_modules/flavor/gn_flavor.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698