| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
| 3 # | 3 # |
| 4 # Use of this source code is governed by a BSD-style license | 4 # Use of this source code is governed by a BSD-style license |
| 5 # that can be found in the LICENSE file in the root of the source | 5 # that can be found in the LICENSE file in the root of the source |
| 6 # tree. An additional intellectual property rights grant can be found | 6 # tree. An additional intellectual property rights grant can be found |
| 7 # in the file PATENTS. All contributing project authors may | 7 # in the file PATENTS. All contributing project authors may |
| 8 # be found in the AUTHORS file in the root of the source tree. | 8 # be found in the AUTHORS file in the root of the source tree. |
| 9 | 9 |
| 10 """Script to download a Chromium checkout into the workspace. | 10 """Script to download a Chromium checkout into the workspace. |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 # https://codereview.chromium.org/1155743013 | 108 # https://codereview.chromium.org/1155743013 |
| 109 # TODO(kjellander): Remove this after the summer of 2015. | 109 # TODO(kjellander): Remove this after the summer of 2015. |
| 110 freetype_src = os.path.join(CR_DIR, 'src', 'third_party', 'freetype-android', | 110 freetype_src = os.path.join(CR_DIR, 'src', 'third_party', 'freetype-android', |
| 111 'src') | 111 'src') |
| 112 if os.path.isdir(freetype_src): | 112 if os.path.isdir(freetype_src): |
| 113 shutil.rmtree(freetype_src) | 113 shutil.rmtree(freetype_src) |
| 114 | 114 |
| 115 # Avoid downloading NaCl toolchain as part of the Chromium hooks. | 115 # Avoid downloading NaCl toolchain as part of the Chromium hooks. |
| 116 gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient' | 116 gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient' |
| 117 args = [ | 117 args = [ |
| 118 gclient_cmd, 'sync', '--force', '--revision', 'src@'+opts.target_revision | 118 gclient_cmd, 'sync', '--force', '--nohooks', '--revision', |
| 119 'src@' + opts.target_revision |
| 119 ] | 120 ] |
| 120 | 121 |
| 121 if os.environ.get('CHROME_HEADLESS') == '1': | 122 if os.environ.get('CHROME_HEADLESS') == '1': |
| 122 # Running on a buildbot. | 123 # Running on a buildbot. |
| 123 args.append('-vvv') | 124 args.append('-vvv') |
| 124 | 125 |
| 125 if sys.platform.startswith('win'): | 126 if sys.platform.startswith('win'): |
| 126 cache_path = os.path.join(os.path.splitdrive(ROOT_DIR)[0] + os.path.sep, | 127 cache_path = os.path.join(os.path.splitdrive(ROOT_DIR)[0] + os.path.sep, |
| 127 'b', 'git-cache') | 128 'b', 'git-cache') |
| 128 else: | 129 else: |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 ret = subprocess.call(args, cwd=opts.chromium_dir) | 182 ret = subprocess.call(args, cwd=opts.chromium_dir) |
| 182 if ret == 0: | 183 if ret == 0: |
| 183 with open(flag_file, 'wb') as f: | 184 with open(flag_file, 'wb') as f: |
| 184 f.write(flag_file_content) | 185 f.write(flag_file_content) |
| 185 | 186 |
| 186 return ret | 187 return ret |
| 187 | 188 |
| 188 | 189 |
| 189 if __name__ == '__main__': | 190 if __name__ == '__main__': |
| 190 sys.exit(main()) | 191 sys.exit(main()) |
| OLD | NEW |