| 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 """Entry point for both build and try bots. | 6 """Entry point for both build and try bots. |
| 7 | 7 |
| 8 This script is invoked from XXX, usually without arguments | 8 This script is invoked from XXX, usually without arguments |
| 9 to package an SDK. It automatically determines whether | 9 to package an SDK. It automatically determines whether |
| 10 this SDK is for mac, win, linux. | 10 this SDK is for mac, win, linux. |
| (...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 554 gyp_defines = gyp_defines or [] | 554 gyp_defines = gyp_defines or [] |
| 555 gyp_defines.append('nacl_allow_thin_archives=0') | 555 gyp_defines.append('nacl_allow_thin_archives=0') |
| 556 gyp_defines.append('use_sysroot=1') | 556 gyp_defines.append('use_sysroot=1') |
| 557 if options.mac_sdk: | 557 if options.mac_sdk: |
| 558 gyp_defines.append('mac_sdk=%s' % options.mac_sdk) | 558 gyp_defines.append('mac_sdk=%s' % options.mac_sdk) |
| 559 | 559 |
| 560 if arch is not None: | 560 if arch is not None: |
| 561 gyp_defines.append('target_arch=%s' % arch) | 561 gyp_defines.append('target_arch=%s' % arch) |
| 562 if arch == 'arm': | 562 if arch == 'arm': |
| 563 gyp_env['GYP_CROSSCOMPILE'] = '1' | 563 gyp_env['GYP_CROSSCOMPILE'] = '1' |
| 564 gyp_defines.append('arm_float_abi=hard') | |
| 565 if options.no_arm_trusted: | 564 if options.no_arm_trusted: |
| 566 gyp_defines.append('disable_cross_trusted=1') | 565 gyp_defines.append('disable_cross_trusted=1') |
| 567 if getos.GetPlatform() == 'mac': | 566 if getos.GetPlatform() == 'mac': |
| 568 gyp_defines.append('clang=1') | 567 gyp_defines.append('clang=1') |
| 569 | 568 |
| 570 gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines) | 569 gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines) |
| 571 # We can't use windows path separators in GYP_GENERATOR_FLAGS since | 570 # We can't use windows path separators in GYP_GENERATOR_FLAGS since |
| 572 # gyp uses shlex to parse them and treats '\' as an escape char. | 571 # gyp uses shlex to parse them and treats '\' as an escape char. |
| 573 gyp_env['GYP_GENERATOR_FLAGS'] = 'output_dir=%s' % out_dir.replace('\\', '/') | 572 gyp_env['GYP_GENERATOR_FLAGS'] = 'output_dir=%s' % out_dir.replace('\\', '/') |
| 574 | 573 |
| (...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1186 BuildStepArchivePNaClComponent() | 1185 BuildStepArchivePNaClComponent() |
| 1187 | 1186 |
| 1188 return 0 | 1187 return 0 |
| 1189 | 1188 |
| 1190 | 1189 |
| 1191 if __name__ == '__main__': | 1190 if __name__ == '__main__': |
| 1192 try: | 1191 try: |
| 1193 sys.exit(main(sys.argv[1:])) | 1192 sys.exit(main(sys.argv[1:])) |
| 1194 except KeyboardInterrupt: | 1193 except KeyboardInterrupt: |
| 1195 buildbot_common.ErrorExit('build_sdk: interrupted') | 1194 buildbot_common.ErrorExit('build_sdk: interrupted') |
| OLD | NEW |