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 import re | 6 import re |
7 import os | 7 import os |
8 import sys | 8 import sys |
9 | 9 |
10 from recipe_engine import recipe_api | 10 from recipe_engine import recipe_api |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 cmd=[git, 'clean', '-d', '-f'], | 237 cmd=[git, 'clean', '-d', '-f'], |
238 cwd=self.skia_dir, | 238 cwd=self.skia_dir, |
239 infra_step=True) | 239 infra_step=True) |
240 | 240 |
241 # Run 'gclient sync'. | 241 # Run 'gclient sync'. |
242 gclient_cfg = self.m.gclient.make_config() | 242 gclient_cfg = self.m.gclient.make_config() |
243 skia = gclient_cfg.solutions.add() | 243 skia = gclient_cfg.solutions.add() |
244 skia.name = 'skia' | 244 skia.name = 'skia' |
245 skia.url = global_constants.SKIA_REPO | 245 skia.url = global_constants.SKIA_REPO |
246 gclient_cfg.got_revision_mapping['skia'] = 'got_revision' | 246 gclient_cfg.got_revision_mapping['skia'] = 'got_revision' |
| 247 gclient_cfg.deps_os['skia'] = 'all' |
247 update_step = self.m.gclient.checkout(gclient_config=gclient_cfg) | 248 update_step = self.m.gclient.checkout(gclient_config=gclient_cfg) |
248 | 249 |
249 self.got_revision = update_step.presentation.properties['got_revision'] | 250 self.got_revision = update_step.presentation.properties['got_revision'] |
250 self.m.tryserver.maybe_apply_issue() | 251 self.m.tryserver.maybe_apply_issue() |
251 | 252 |
252 def compile_steps(self, clobber=False): | 253 def compile_steps(self, clobber=False): |
253 """Run the steps to build Skia.""" | 254 """Run the steps to build Skia.""" |
254 if self.builder_cfg.get('extra_config') == 'Swarming': | 255 if self.builder_cfg.get('extra_config') == 'Swarming': |
255 # Swarming setup. | 256 # Swarming setup. |
256 self.m.swarming_client.checkout(revision='') | 257 self.m.swarming_client.checkout(revision='') |
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
785 # Don't bother to include role, which is always Test. | 786 # Don't bother to include role, which is always Test. |
786 # TryBots are uploaded elsewhere so they can use the same key. | 787 # TryBots are uploaded elsewhere so they can use the same key. |
787 blacklist = ['role', 'is_trybot'] | 788 blacklist = ['role', 'is_trybot'] |
788 | 789 |
789 flat = [] | 790 flat = [] |
790 for k in sorted(self.builder_cfg.keys()): | 791 for k in sorted(self.builder_cfg.keys()): |
791 if k not in blacklist: | 792 if k not in blacklist: |
792 flat.append(k) | 793 flat.append(k) |
793 flat.append(self.builder_cfg[k]) | 794 flat.append(self.builder_cfg[k]) |
794 return flat | 795 return flat |
OLD | NEW |