diff options
| author |  mtklein <mtklein@chromium.org> | 2016-09-01 13:19:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-01 13:19:21 -0700 |
| commit | ae509db48198840a607f943cf29b48765fb339da (patch) | |
| tree | 06238087a8f32376671c5ab059e0f9b3cf8415e5 /infra/bots/recipe_modules/flavor | |
| parent | de3184fd846925d716e8dc530316c1b606e52511 (diff) | |
GN: expunge all environment variables that have no effect on GN
This should have no practical effect. I just want to make sure no
environment variables beyond $PATH have any effect on GN builds.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2300173002
Review-Url: https://codereview.chromium.org/2300173002
Diffstat (limited to 'infra/bots/recipe_modules/flavor')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_android_flavor.py | 14 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py index 9f3480a1a7..12832ecc83 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]) diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index 66497b5d58..f759d4bcc4 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -15,6 +15,11 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): extra_config.startswith('SK') ]) + 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) + def compile(self, unused_target, **kwargs): """Build Skia with GN.""" compiler = self.m.vars.builder_cfg.get('compiler', '') @@ -55,9 +60,6 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): 'is_debug': 'true' if configuration == 'Debug' else 'false', }.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]) |