| 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 30 matching lines...) Expand all Loading... |
| 41 'Build-Win-MSVC-x86-Release-GN', | 41 'Build-Win-MSVC-x86-Release-GN', |
| 42 'Build-Win-MSVC-x86_64-Release-Vulkan', | 42 'Build-Win-MSVC-x86_64-Release-Vulkan', |
| 43 ], | 43 ], |
| 44 }, | 44 }, |
| 45 } | 45 } |
| 46 | 46 |
| 47 | 47 |
| 48 def RunSteps(api): | 48 def RunSteps(api): |
| 49 api.core.setup() | 49 api.core.setup() |
| 50 | 50 |
| 51 env = api.vars.builder_spec['env'] |
| 52 |
| 53 build_targets = api.vars.builder_spec['build_targets'] |
| 54 |
| 51 try: | 55 try: |
| 52 for target in api.vars.build_targets: | 56 for target in build_targets: |
| 53 api.flavor.compile(target) | 57 api.flavor.compile(target, env=env) |
| 54 api.run.copy_build_products( | 58 api.run.copy_build_products( |
| 55 api.flavor.out_dir, | 59 api.flavor.out_dir, |
| 56 api.vars.swarming_out_dir.join( | 60 api.vars.swarming_out_dir.join( |
| 57 'out', api.vars.configuration)) | 61 'out', api.vars.configuration)) |
| 58 api.flavor.copy_extra_build_products(api.vars.swarming_out_dir) | 62 api.flavor.copy_extra_build_products(api.vars.swarming_out_dir) |
| 59 finally: | 63 finally: |
| 60 if 'Win' in api.vars.builder_cfg.get('os', ''): | 64 if 'Win' in api.vars.builder_cfg.get('os', ''): |
| 61 api.python.inline( | 65 api.python.inline( |
| 62 name='cleanup', | 66 name='cleanup', |
| 63 program='''import psutil | 67 program='''import psutil |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 path_config='kitchen', | 161 path_config='kitchen', |
| 158 swarm_out_dir='[SWARM_OUT_DIR]', | 162 swarm_out_dir='[SWARM_OUT_DIR]', |
| 159 rietveld='https://codereview.chromium.org', | 163 rietveld='https://codereview.chromium.org', |
| 160 patchset=1, | 164 patchset=1, |
| 161 issue=2147533002L) + | 165 issue=2147533002L) + |
| 162 api.path.exists( | 166 api.path.exists( |
| 163 api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') | 167 api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
| 164 ) + | 168 ) + |
| 165 api.platform('win', 64) | 169 api.platform('win', 64) |
| 166 ) | 170 ) |
| OLD | NEW |