| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 | 5 |
| 6 # Recipe module for Skia Swarming compile. | 6 # Recipe module for Skia Swarming compile. |
| 7 | 7 |
| 8 | 8 |
| 9 DEPS = [ | 9 DEPS = [ |
| 10 'core', | 10 'core', |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 'Build-Win-MSVC-x86_64-Release-Vulkan', | 54 'Build-Win-MSVC-x86_64-Release-Vulkan', |
| 55 ], | 55 ], |
| 56 }, | 56 }, |
| 57 } | 57 } |
| 58 | 58 |
| 59 | 59 |
| 60 def build_targets_from_builder_dict(builder_dict): | 60 def build_targets_from_builder_dict(builder_dict): |
| 61 """Return a list of targets to build, depending on the builder type.""" | 61 """Return a list of targets to build, depending on the builder type.""" |
| 62 if builder_dict.get('extra_config') == 'iOS': | 62 if builder_dict.get('extra_config') == 'iOS': |
| 63 return ['iOSShell'] | 63 return ['iOSShell'] |
| 64 if 'SAN' in builder_dict.get('extra_config', ''): | 64 return ['most'] |
| 65 # 'most' does not compile under MSAN. | |
| 66 return ['dm', 'nanobench'] | |
| 67 else: | |
| 68 return ['most'] | |
| 69 | 65 |
| 70 | 66 |
| 71 def get_extra_env_vars(builder_dict): | 67 def get_extra_env_vars(builder_dict): |
| 72 env = {} | 68 env = {} |
| 73 if builder_dict.get('compiler') == 'Clang': | 69 if builder_dict.get('compiler') == 'Clang': |
| 74 env['CC'] = '/usr/bin/clang' | 70 env['CC'] = '/usr/bin/clang' |
| 75 env['CXX'] = '/usr/bin/clang++' | 71 env['CXX'] = '/usr/bin/clang++' |
| 76 | 72 |
| 77 # SKNX_NO_SIMD, SK_USE_DISCARDABLE_SCALEDIMAGECACHE, etc. | 73 # SKNX_NO_SIMD, SK_USE_DISCARDABLE_SCALEDIMAGECACHE, etc. |
| 78 extra_config = builder_dict.get('extra_config', '') | 74 extra_config = builder_dict.get('extra_config', '') |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 326 buildername=buildername + '-Trybot', | 322 buildername=buildername + '-Trybot', |
| 327 mastername=mastername, | 323 mastername=mastername, |
| 328 slavename=slavename, | 324 slavename=slavename, |
| 329 buildnumber=5, | 325 buildnumber=5, |
| 330 path_config='kitchen', | 326 path_config='kitchen', |
| 331 swarm_out_dir='[SWARM_OUT_DIR]', | 327 swarm_out_dir='[SWARM_OUT_DIR]', |
| 332 revision='abc123', | 328 revision='abc123', |
| 333 **gerrit_kwargs) + | 329 **gerrit_kwargs) + |
| 334 api.platform('win', 64) | 330 api.platform('win', 64) |
| 335 ) | 331 ) |
| OLD | NEW |