diff options
| author |  Mike Klein <mtklein@chromium.org> | 2016-11-07 15:38:48 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-07 21:20:18 +0000 |
| commit | 6749af40739fab375d87951c5b0fb51a195e1f8c (patch) | |
| tree | ae34d80f1218aacf34f8d7349ceb1bfb8c2b2faa /infra/bots/recipe_modules | |
| parent | 7e8f80a08444f534376a25d45194c92f948c9594 (diff) | |
Add GN iOS builder.
This gets up a bot to build for iOS via GN as much as we can right now. This is unlikely to be the long term structure of the iOS bots... by the time we add Test/Perf bots we'll likely need to have a gn_ios_flavor.py. But for now, this keeps the GN iOS build such as it is working.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4457
Change-Id: Ideb10ae3f4ab5530ad153237a343dd5c0e7dd02f
Reviewed-on: https://skia-review.googlesource.com/4457
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipe_modules')
| -rw-r--r-- | infra/bots/recipe_modules/flavor/api.py | 2 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/flavor/gn_flavor.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/infra/bots/recipe_modules/flavor/api.py b/infra/bots/recipe_modules/flavor/api.py index 08b9972dc8..7d4c5b8805 100644 --- a/infra/bots/recipe_modules/flavor/api.py +++ b/infra/bots/recipe_modules/flavor/api.py @@ -31,7 +31,7 @@ def is_android(builder_cfg): def is_ios(builder_cfg): - return ('iOS' in builder_cfg.get('extra_config', '') or + return ('iOS' == builder_cfg.get('extra_config', '') or builder_cfg.get('os') == 'iOS') diff --git a/infra/bots/recipe_modules/flavor/gn_flavor.py b/infra/bots/recipe_modules/flavor/gn_flavor.py index a019de2357..af400d9045 100644 --- a/infra/bots/recipe_modules/flavor/gn_flavor.py +++ b/infra/bots/recipe_modules/flavor/gn_flavor.py @@ -92,6 +92,7 @@ class GNFlavorUtils(default_flavor.DefaultFlavorUtils): 'sanitize': extra_config if 'SAN' in extra_config else '', 'skia_vulkan_sdk': win_vulkan_sdk if extra_config == 'Vulkan' else '', 'target_cpu': 'x86' if target_arch == 'x86' else '', + 'target_os': 'ios' if 'iOS' in extra_config else '', 'windk': win_toolchain if 'Win' in os else '', }.iteritems(): if v: |