diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-10-17 14:36:18 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-18 16:54:25 +0000 |
| commit | b9eb887f8baa3dcf89b0106a799aff03b5c1cbba (patch) | |
| tree | bc24a9e642b34ca13eaf3728dd98111870286a98 /infra/bots/recipe_modules/flavor/gn_flavor.py | |
| parent | 2e68865813d6aa9442c5e9e785a217e23120abe4 (diff) | |
Some GN-related recipe cleanup.
All our bots but the iOS ones are on GN now. This cleans up a bunch of GYP and other obsolete stuff.
- Nothing's using default_flavor.py any more except as a base class.
- There are no -CMake, -Shared or -VisualBench bots anymore.
- Only the iOS bots care about GYP_DEFINES.
You'll see the PDFium bot's GYP_DEFINES change, but that doesn't matter... it's using PDFium's own (GN) build system, and it ignores GYP_DEFINES.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3567
Change-Id: I699e10f013ea77df4dcaa1cb559c51c5bf55dfdb
Reviewed-on: https://skia-review.googlesource.com/3567
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/flavor/gn_flavor.py')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index b7ef1dd643..6e01dee1c2 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -6,29 +6,6 @@ import default_flavor """GN flavor utils, used for building Skia with GN.""" class GNFlavorUtils(default_flavor.DefaultFlavorUtils): - def supported(self): - # TODO: simplify! - 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([ - 'CT' in extra_config, - 'SAN' in extra_config, - extra_config == 'ANGLE', - extra_config == 'CommandBuffer', - extra_config == 'Exceptions', - extra_config == 'Fast', - extra_config == 'GDI', - extra_config == 'GN', - extra_config == 'Mesa', - extra_config == 'NoGPU', - extra_config.startswith('SK'), - extra_config == 'Vulkan', - os == 'Ubuntu' and target_arch == 'x86', - 'Win' in os, - ]) - def _strip_environment(self): self.m.vars.default_env = {k: v for (k,v) in self.m.vars.default_env.iteritems() |