| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 # pylint: disable=W0201 | 6 # pylint: disable=W0201 |
| 7 | 7 |
| 8 | 8 |
| 9 """Default flavor utils class, used for desktop builders.""" | 9 """Default flavor utils class, used for desktop builders.""" |
| 10 | 10 |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 def compile(self, target, **kwargs): | 132 def compile(self, target, **kwargs): |
| 133 """Build the given target.""" | 133 """Build the given target.""" |
| 134 env = kwargs.pop('env', {}) | 134 env = kwargs.pop('env', {}) |
| 135 # The CHROME_PATH environment variable is needed for builders that use | 135 # The CHROME_PATH environment variable is needed for builders that use |
| 136 # toolchains downloaded by Chrome. | 136 # toolchains downloaded by Chrome. |
| 137 env['CHROME_PATH'] = self.chrome_path | 137 env['CHROME_PATH'] = self.chrome_path |
| 138 if self.m.platform.is_win: | 138 if self.m.platform.is_win: |
| 139 make_cmd = ['python', 'make.py'] | 139 make_cmd = ['python', 'make.py'] |
| 140 self.m.run.run_once(self.bootstrap_win_toolchain) | 140 self.m.run.run_once(self.bootstrap_win_toolchain) |
| 141 if 'Vulkan' in self.m.vars.builder_name: | 141 if 'Vulkan' in self.m.vars.builder_name: |
| 142 env['VK_SDK_PATH'] = self.m.vars.slave_dir.join('win_vulkan_sdk') | 142 env['VULKAN_SDK'] = self.m.vars.slave_dir.join('win_vulkan_sdk') |
| 143 else: | 143 else: |
| 144 make_cmd = ['make'] | 144 make_cmd = ['make'] |
| 145 cmd = make_cmd + [target] | 145 cmd = make_cmd + [target] |
| 146 try: | 146 try: |
| 147 self.m.run(self.m.step, 'build %s' % target, cmd=cmd, | 147 self.m.run(self.m.step, 'build %s' % target, cmd=cmd, |
| 148 env=env, cwd=self.m.path['checkout'], **kwargs) | 148 env=env, cwd=self.m.path['checkout'], **kwargs) |
| 149 except self.m.step.StepFailure: | 149 except self.m.step.StepFailure: |
| 150 if self.m.platform.is_win: | 150 if self.m.platform.is_win: |
| 151 # The linker occasionally crashes on Windows. Try again. | 151 # The linker occasionally crashes on Windows. Try again. |
| 152 self.m.run(self.m.step, 'build %s' % target, cmd=cmd, | 152 self.m.run(self.m.step, 'build %s' % target, cmd=cmd, |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 perf_data_dir=self.m.vars.perf_data_dir, | 225 perf_data_dir=self.m.vars.perf_data_dir, |
| 226 resource_dir=self.m.vars.resource_dir, | 226 resource_dir=self.m.vars.resource_dir, |
| 227 images_dir=self.m.vars.images_dir, | 227 images_dir=self.m.vars.images_dir, |
| 228 skp_dir=self.m.vars.local_skp_dir, | 228 skp_dir=self.m.vars.local_skp_dir, |
| 229 svg_dir=self.m.vars.local_svg_dir, | 229 svg_dir=self.m.vars.local_svg_dir, |
| 230 tmp_dir=self.m.vars.tmp_dir) | 230 tmp_dir=self.m.vars.tmp_dir) |
| 231 | 231 |
| 232 def cleanup_steps(self): | 232 def cleanup_steps(self): |
| 233 """Run any device-specific cleanup steps.""" | 233 """Run any device-specific cleanup steps.""" |
| 234 pass | 234 pass |
| OLD | NEW |