| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """Shim to run nacl toolchain download script only if there is a nacl dir.""" | 6 """Shim to run nacl toolchain download script only if there is a nacl dir.""" |
| 7 | 7 |
| 8 import os | 8 import os |
| 9 import sys | 9 import sys |
| 10 | 10 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 if 'target_arch=arm' in os.environ.get('GYP_DEFINES', ''): | 43 if 'target_arch=arm' in os.environ.get('GYP_DEFINES', ''): |
| 44 use_pnacl = True | 44 use_pnacl = True |
| 45 buildbot_name = os.environ.get('BUILDBOT_BUILDERNAME', '') | 45 buildbot_name = os.environ.get('BUILDBOT_BUILDERNAME', '') |
| 46 if buildbot_name.find('pnacl') >= 0 and buildbot_name.find('sdk') >= 0: | 46 if buildbot_name.find('pnacl') >= 0 and buildbot_name.find('sdk') >= 0: |
| 47 use_pnacl = True | 47 use_pnacl = True |
| 48 if use_pnacl: | 48 if use_pnacl: |
| 49 print '\n*** DOWNLOADING PNACL TOOLCHAIN ***\n' | 49 print '\n*** DOWNLOADING PNACL TOOLCHAIN ***\n' |
| 50 else: | 50 else: |
| 51 args.append('--no-pnacl') | 51 args.append('--no-pnacl') |
| 52 | 52 |
| 53 download_toolchains.Main(args) | 53 # Append the name of the file to use as a version and hash source. |
| 54 # NOTE: While not recommended, it is possible to redirect this file to |
| 55 # a chrome location to avoid branching NaCl if just a toolchain needs |
| 56 # to be bumped. |
| 57 args.append(os.path.join(nacl_dir,'TOOL_REVISIONS')) |
| 58 |
| 59 download_toolchains.main(args) |
| 54 return 0 | 60 return 0 |
| 55 | 61 |
| 56 | 62 |
| 57 if __name__ == '__main__': | 63 if __name__ == '__main__': |
| 58 sys.exit(Main(sys.argv[1:])) | 64 sys.exit(Main(sys.argv[1:])) |
| OLD | NEW |