| 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 import json | 9 import json |
| 10 import os | 10 import os |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 if self.m.vars.need_pdfium_checkout: | 103 if self.m.vars.need_pdfium_checkout: |
| 104 pdfium = gclient_cfg.solutions.add() | 104 pdfium = gclient_cfg.solutions.add() |
| 105 pdfium.name = 'pdfium' | 105 pdfium.name = 'pdfium' |
| 106 pdfium.managed = False | 106 pdfium.managed = False |
| 107 pdfium.url = 'https://pdfium.googlesource.com/pdfium.git' | 107 pdfium.url = 'https://pdfium.googlesource.com/pdfium.git' |
| 108 pdfium.revision = 'origin/master' | 108 pdfium.revision = 'origin/master' |
| 109 self.update_repo(self.m.vars.checkout_root, pdfium) | 109 self.update_repo(self.m.vars.checkout_root, pdfium) |
| 110 | 110 |
| 111 # Run 'gclient sync'. | 111 # Run 'gclient sync'. |
| 112 gclient_cfg.got_revision_mapping['skia'] = 'got_revision' | 112 gclient_cfg.got_revision_mapping['skia'] = 'got_revision' |
| 113 gclient_cfg.target_os.add('llvm') | |
| 114 checkout_kwargs = {} | 113 checkout_kwargs = {} |
| 115 checkout_kwargs['env'] = self.m.vars.default_env | 114 checkout_kwargs['env'] = self.m.vars.default_env |
| 116 | 115 |
| 117 # api.gclient.revert() assumes things about the layout of the code, so it | 116 # api.gclient.revert() assumes things about the layout of the code, so it |
| 118 # fails for us. Run an appropriate revert sequence for trybots instead. | 117 # fails for us. Run an appropriate revert sequence for trybots instead. |
| 119 gclient_file = self.m.vars.checkout_root.join('.gclient') | 118 gclient_file = self.m.vars.checkout_root.join('.gclient') |
| 120 if (self.m.tryserver.is_tryserver and | 119 if (self.m.tryserver.is_tryserver and |
| 121 self.m.path.exists(gclient_file)): # pragma: no cover | 120 self.m.path.exists(gclient_file)): # pragma: no cover |
| 122 # These steps taken from: | 121 # These steps taken from: |
| 123 # https://chromium.googlesource.com/chromium/tools/build/+/ | 122 # https://chromium.googlesource.com/chromium/tools/build/+/ |
| (...skipping 16 matching lines...) Expand all Loading... |
| 140 self.m.vars.got_revision = ( | 139 self.m.vars.got_revision = ( |
| 141 update_step.presentation.properties['got_revision']) | 140 update_step.presentation.properties['got_revision']) |
| 142 self.m.tryserver.maybe_apply_issue() | 141 self.m.tryserver.maybe_apply_issue() |
| 143 if self.m.properties.get('patch_storage') == 'gerrit': | 142 if self.m.properties.get('patch_storage') == 'gerrit': |
| 144 self.m.bot_update.apply_gerrit_ref( | 143 self.m.bot_update.apply_gerrit_ref( |
| 145 root=str(self.m.vars.checkout_root.join('skia'))) | 144 root=str(self.m.vars.checkout_root.join('skia'))) |
| 146 | 145 |
| 147 if self.m.vars.need_chromium_checkout: | 146 if self.m.vars.need_chromium_checkout: |
| 148 self.m.gclient.runhooks(cwd=self.m.vars.checkout_root, | 147 self.m.gclient.runhooks(cwd=self.m.vars.checkout_root, |
| 149 env=self.m.vars.gclient_env) | 148 env=self.m.vars.gclient_env) |
| OLD | NEW |