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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 gclient_cfg = self.m.gclient.make_config() | 285 gclient_cfg = self.m.gclient.make_config() |
286 skia = gclient_cfg.solutions.add() | 286 skia = gclient_cfg.solutions.add() |
287 skia.name = 'skia' | 287 skia.name = 'skia' |
288 skia.managed = False | 288 skia.managed = False |
289 skia.url = global_constants.SKIA_REPO | 289 skia.url = global_constants.SKIA_REPO |
290 skia.revision = self.m.properties.get('revision') or 'origin/master' | 290 skia.revision = self.m.properties.get('revision') or 'origin/master' |
291 self.update_repo(skia) | 291 self.update_repo(skia) |
292 | 292 |
293 # Run 'gclient sync'. | 293 # Run 'gclient sync'. |
294 gclient_cfg.got_revision_mapping['skia'] = 'got_revision' | 294 gclient_cfg.got_revision_mapping['skia'] = 'got_revision' |
| 295 gclient_cfg.deps_os['skia'] = 'all' |
295 update_step = self.m.gclient.checkout(gclient_config=gclient_cfg) | 296 update_step = self.m.gclient.checkout(gclient_config=gclient_cfg) |
296 | 297 |
297 self.got_revision = update_step.presentation.properties['got_revision'] | 298 self.got_revision = update_step.presentation.properties['got_revision'] |
298 self.m.tryserver.maybe_apply_issue() | 299 self.m.tryserver.maybe_apply_issue() |
299 | 300 |
300 def compile_steps(self, clobber=False): | 301 def compile_steps(self, clobber=False): |
301 """Run the steps to build Skia.""" | 302 """Run the steps to build Skia.""" |
302 for target in self.build_targets: | 303 for target in self.build_targets: |
303 self.flavor.compile(target) | 304 self.flavor.compile(target) |
304 | 305 |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
859 # Don't bother to include role, which is always Test. | 860 # Don't bother to include role, which is always Test. |
860 # TryBots are uploaded elsewhere so they can use the same key. | 861 # TryBots are uploaded elsewhere so they can use the same key. |
861 blacklist = ['role', 'is_trybot'] | 862 blacklist = ['role', 'is_trybot'] |
862 | 863 |
863 flat = [] | 864 flat = [] |
864 for k in sorted(self.builder_cfg.keys()): | 865 for k in sorted(self.builder_cfg.keys()): |
865 if k not in blacklist: | 866 if k not in blacklist: |
866 flat.append(k) | 867 flat.append(k) |
867 flat.append(self.builder_cfg[k]) | 868 flat.append(self.builder_cfg[k]) |
868 return flat | 869 return flat |
OLD | NEW |