| 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 """This script is used to download prebuilt clang binaries. | 6 """This script is used to download prebuilt clang binaries. |
| 7 | 7 |
| 8 It is also used by package.py to build the prebuilt clang binaries.""" | 8 It is also used by package.py to build the prebuilt clang binaries.""" |
| 9 | 9 |
| 10 import argparse | 10 import argparse |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 # Try using the toolchain in depot_tools. | 332 # Try using the toolchain in depot_tools. |
| 333 # This sets environment variables used by SelectVisualStudioVersion below. | 333 # This sets environment variables used by SelectVisualStudioVersion below. |
| 334 sys.path.append(os.path.join(CHROMIUM_DIR, 'build')) | 334 sys.path.append(os.path.join(CHROMIUM_DIR, 'build')) |
| 335 import vs_toolchain | 335 import vs_toolchain |
| 336 vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() | 336 vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs() |
| 337 | 337 |
| 338 # Use gyp to find the MSVS installation, either in depot_tools as per above, | 338 # Use gyp to find the MSVS installation, either in depot_tools as per above, |
| 339 # or a system-wide installation otherwise. | 339 # or a system-wide installation otherwise. |
| 340 sys.path.append(os.path.join(CHROMIUM_DIR, 'tools', 'gyp', 'pylib')) | 340 sys.path.append(os.path.join(CHROMIUM_DIR, 'tools', 'gyp', 'pylib')) |
| 341 import gyp.MSVSVersion | 341 import gyp.MSVSVersion |
| 342 vs_version = gyp.MSVSVersion.SelectVisualStudioVersion('2013') | 342 vs_version = gyp.MSVSVersion.SelectVisualStudioVersion( |
| 343 vs_toolchain.GetVisualStudioVersion()) |
| 343 return vs_version | 344 return vs_version |
| 344 | 345 |
| 345 | 346 |
| 346 def UpdateClang(args): | 347 def UpdateClang(args): |
| 347 print 'Updating Clang to %s...' % PACKAGE_VERSION | 348 print 'Updating Clang to %s...' % PACKAGE_VERSION |
| 348 | 349 |
| 349 need_gold_plugin = 'LLVM_DOWNLOAD_GOLD_PLUGIN' in os.environ or ( | 350 need_gold_plugin = 'LLVM_DOWNLOAD_GOLD_PLUGIN' in os.environ or ( |
| 350 sys.platform.startswith('linux') and | 351 sys.platform.startswith('linux') and |
| 351 'buildtype=Official' in os.environ.get('GYP_DEFINES', '') and | 352 'buildtype=Official' in os.environ.get('GYP_DEFINES', '') and |
| 352 'branding=Chrome' in os.environ.get('GYP_DEFINES', '')) | 353 'branding=Chrome' in os.environ.get('GYP_DEFINES', '')) |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 784 args.force_local_build = True | 785 args.force_local_build = True |
| 785 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): | 786 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): |
| 786 # Only build the Android ASan rt on ToT bots when targetting Android. | 787 # Only build the Android ASan rt on ToT bots when targetting Android. |
| 787 args.with_android = False | 788 args.with_android = False |
| 788 | 789 |
| 789 return UpdateClang(args) | 790 return UpdateClang(args) |
| 790 | 791 |
| 791 | 792 |
| 792 if __name__ == '__main__': | 793 if __name__ == '__main__': |
| 793 sys.exit(main()) | 794 sys.exit(main()) |
| OLD | NEW |