diff options
| author |  mtklein <mtklein@chromium.org> | 2016-09-15 11:06:25 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-15 11:06:25 -0700 |
| commit | 1949386ae00485ae92dd5608a2614b9dee417542 (patch) | |
| tree | c5eed6bc1554605f5abdeb435ac1a6f5af753e36 /infra/bots/recipe_modules | |
| parent | 1bf8e6e16e33c60d6fc0a6e911c4730e91c5f4e5 (diff) | |
GN: support 32-bit x86 builds
Take over Ubuntu -x86- bots.
Note the change to Build-Win-MSVC-x86-Release-GN.json, which is not incidental.
We'll want target_cpu="x86" there too.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2340463008
Review-Url: https://codereview.chromium.org/2340463008
Diffstat (limited to 'infra/bots/recipe_modules')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index bef577926d..fb02a3ae3a 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -8,12 +8,15 @@ import default_flavor class GNFlavorUtils(default_flavor.DefaultFlavorUtils): def supported(self): extra_config = self.m.vars.builder_cfg.get('extra_config', '') + os = self.m.vars.builder_cfg.get('os', '') + target_arch = self.m.vars.builder_cfg.get('target_arch', '') return any([ 'SAN' in extra_config, extra_config == 'Fast', extra_config == 'GN', - extra_config.startswith('SK') + extra_config.startswith('SK'), + os == 'Ubuntu' and target_arch == 'x86', ]) def _run(self, title, cmd, env=None, infra_step=False): @@ -29,6 +32,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): configuration = self.m.vars.builder_cfg.get('configuration', '') extra_config = self.m.vars.builder_cfg.get('extra_config', '') os = self.m.vars.builder_cfg.get('os', '') + target_arch = self.m.vars.builder_cfg.get('target_arch', '') clang_linux = str(self.m.vars.slave_dir.join('clang_linux')) @@ -65,6 +69,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): 'extra_cflags': ' '.join(extra_cflags), 'extra_ldflags': ' '.join(extra_ldflags), 'sanitize': extra_config if 'SAN' in extra_config else '', + 'target_cpu': 'x86' if target_arch == 'x86' else '', }.iteritems(): if v: args[k] = '"%s"' % v |