| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2014 The LibYuv Project Authors. All rights reserved. | 2 # Copyright 2014 The LibYuv 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 os.path.exists(flag_file)): | 79 os.path.exists(flag_file)): |
| 80 with open(flag_file, 'r') as f: | 80 with open(flag_file, 'r') as f: |
| 81 if f.read() == flag_file_content: | 81 if f.read() == flag_file_content: |
| 82 print 'Chromium already up to date: ', opts.target_revision | 82 print 'Chromium already up to date: ', opts.target_revision |
| 83 return 0 | 83 return 0 |
| 84 os.unlink(flag_file) | 84 os.unlink(flag_file) |
| 85 | 85 |
| 86 env = os.environ.copy() | 86 env = os.environ.copy() |
| 87 | 87 |
| 88 # Avoid downloading NaCl toolchain as part of the Chromium hooks. | 88 # Avoid downloading NaCl toolchain as part of the Chromium hooks. |
| 89 env.setdefault('GYP_DEFINES', '') | |
| 90 env['GYP_DEFINES'] += ' disable_nacl=1' | |
| 91 env['GYP_CHROMIUM_NO_ACTION'] = '1' | 89 env['GYP_CHROMIUM_NO_ACTION'] = '1' |
| 92 gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient' | 90 gclient_cmd = 'gclient.bat' if sys.platform.startswith('win') else 'gclient' |
| 93 args = [ | 91 args = [ |
| 94 gclient_cmd, 'sync', '--force', '--revision', 'src@'+opts.target_revision | 92 gclient_cmd, 'sync', '--force', '--revision', 'src@'+opts.target_revision |
| 95 ] | 93 ] |
| 96 | 94 |
| 97 if os.environ.get('CHROME_HEADLESS') == '1': | 95 if os.environ.get('CHROME_HEADLESS') == '1': |
| 98 # Running on a buildbot. | 96 # Running on a buildbot. |
| 99 args.append('-vvv') | 97 args.append('-vvv') |
| 100 | 98 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 ret = subprocess.call(args, cwd=opts.chromium_dir, env=env) | 145 ret = subprocess.call(args, cwd=opts.chromium_dir, env=env) |
| 148 if ret == 0: | 146 if ret == 0: |
| 149 with open(flag_file, 'wb') as f: | 147 with open(flag_file, 'wb') as f: |
| 150 f.write(flag_file_content) | 148 f.write(flag_file_content) |
| 151 | 149 |
| 152 return ret | 150 return ret |
| 153 | 151 |
| 154 | 152 |
| 155 if __name__ == '__main__': | 153 if __name__ == '__main__': |
| 156 sys.exit(main()) | 154 sys.exit(main()) |
| OLD | NEW |