diff options
Diffstat (limited to 'infra/bots/recipe_modules/flavor/gn_flavor.py')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index f02f2be962..3b81255168 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -105,6 +105,8 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): args['skia_vulkan_sdk'] = '"%s"' % linux_vulkan_sdk if 'Win' in os: args['skia_vulkan_sdk'] = '"%s"' % win_vulkan_sdk + if 'CheckGeneratedFiles' in extra_config: + args['skia_compile_processors'] = 'true' for (k,v) in { 'cc': cc, @@ -129,8 +131,16 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): with self.m.context(cwd=self.m.vars.skia_dir): self._py('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]) + env = {} + if 'CheckGeneratedFiles' in extra_config: + env['PATH'] = '%s:%%(PATH)s' % self.m.vars.skia_dir.join('bin') + self._py( + 'fetch-clang-format', + self.m.vars.skia_dir.join('bin', 'fetch-clang-format')) + + with self.m.env(env): + self._run('gn gen', [gn, 'gen', self.out_dir, '--args=' + gn_args]) + self._run('ninja', [ninja, '-C', self.out_dir]) def copy_extra_build_products(self, swarming_out_dir): configuration = self.m.vars.builder_cfg.get('configuration', '') |