| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2014 The Chromium Authors. All rights reserved. | 2 # Copyright 2014 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 """Script to build binary components of the SDK. | 6 """Script to build binary components of the SDK. |
| 7 | 7 |
| 8 This script builds binary components of the Native Client SDK, create tarballs | 8 This script builds binary components of the Native Client SDK, create tarballs |
| 9 for them, and uploads them to Google Cloud Storage. | 9 for them, and uploads them to Google Cloud Storage. |
| 10 | 10 |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir): | 203 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir): |
| 204 gyp_env = dict(os.environ) | 204 gyp_env = dict(os.environ) |
| 205 gyp_env['GYP_GENERATORS'] = 'ninja' | 205 gyp_env['GYP_GENERATORS'] = 'ninja' |
| 206 gyp_defines = ['nacl_allow_thin_archives=0'] | 206 gyp_defines = ['nacl_allow_thin_archives=0'] |
| 207 if options.mac_sdk: | 207 if options.mac_sdk: |
| 208 gyp_defines.append('mac_sdk=%s' % options.mac_sdk) | 208 gyp_defines.append('mac_sdk=%s' % options.mac_sdk) |
| 209 if arch: | 209 if arch: |
| 210 gyp_defines.append('target_arch=%s' % arch) | 210 gyp_defines.append('target_arch=%s' % arch) |
| 211 if arch == 'arm': | 211 if arch == 'arm': |
| 212 gyp_env['GYP_CROSSCOMPILE'] = '1' | 212 gyp_env['GYP_CROSSCOMPILE'] = '1' |
| 213 gyp_defines += ['arm_float_abi=hard'] | |
| 214 if options.no_arm_trusted: | 213 if options.no_arm_trusted: |
| 215 gyp_defines.append('disable_cross_trusted=1') | 214 gyp_defines.append('disable_cross_trusted=1') |
| 216 if PLATFORM == 'mac': | 215 if PLATFORM == 'mac': |
| 217 gyp_defines.append('clang=1') | 216 gyp_defines.append('clang=1') |
| 218 | 217 |
| 219 gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines) | 218 gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines) |
| 220 generator_flags = ['-G', 'output_dir=%s' % out_dir] | 219 generator_flags = ['-G', 'output_dir=%s' % out_dir] |
| 221 depth = '--depth=.' | 220 depth = '--depth=.' |
| 222 cmd = [sys.executable, gyp_py_script, gyp_file, depth] + generator_flags | 221 cmd = [sys.executable, gyp_py_script, gyp_file, depth] + generator_flags |
| 223 buildbot_common.Run(cmd, cwd=SRC_DIR, env=gyp_env) | 222 buildbot_common.Run(cmd, cwd=SRC_DIR, env=gyp_env) |
| (...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 582 if options.upload: | 581 if options.upload: |
| 583 UploadArchives() | 582 UploadArchives() |
| 584 | 583 |
| 585 return 0 | 584 return 0 |
| 586 | 585 |
| 587 if __name__ == '__main__': | 586 if __name__ == '__main__': |
| 588 try: | 587 try: |
| 589 sys.exit(main(sys.argv[1:])) | 588 sys.exit(main(sys.argv[1:])) |
| 590 except KeyboardInterrupt: | 589 except KeyboardInterrupt: |
| 591 buildbot_common.ErrorExit('build_artifacts: interrupted') | 590 buildbot_common.ErrorExit('build_artifacts: interrupted') |
| OLD | NEW |