Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: native_client_sdk/src/build_tools/build_sdk.py

Issue 911423002: [NaCl SDK] Set nacl_allow_thin_archives to 0 in prep for build_nexe change. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unittest Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 out_dir = MakeNinjaRelPath(rel_out_dir) 517 out_dir = MakeNinjaRelPath(rel_out_dir)
518 gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client', 'src', 518 gyp_file = os.path.join(SRC_DIR, 'ppapi', 'native_client', 'src',
519 'untrusted', 'pnacl_irt_shim', 'pnacl_irt_shim.gyp') 519 'untrusted', 'pnacl_irt_shim', 'pnacl_irt_shim.gyp')
520 targets = ['aot'] 520 targets = ['aot']
521 GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir) 521 GypNinjaBuild(target_arch, gyp_py, gyp_file, targets, out_dir)
522 522
523 523
524 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir): 524 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
525 gyp_env = dict(os.environ) 525 gyp_env = dict(os.environ)
526 gyp_env['GYP_GENERATORS'] = 'ninja' 526 gyp_env['GYP_GENERATORS'] = 'ninja'
527 gyp_defines = [] 527 gyp_defines = ['nacl_allow_thin_archives=0']
528 if options.mac_sdk: 528 if options.mac_sdk:
529 gyp_defines.append('mac_sdk=%s' % options.mac_sdk) 529 gyp_defines.append('mac_sdk=%s' % options.mac_sdk)
530 if arch is not None: 530 if arch is not None:
531 gyp_defines.append('target_arch=%s' % arch) 531 gyp_defines.append('target_arch=%s' % arch)
532 if arch == 'arm': 532 if arch == 'arm':
533 gyp_env['GYP_CROSSCOMPILE'] = '1' 533 gyp_env['GYP_CROSSCOMPILE'] = '1'
534 gyp_defines += ['arm_float_abi=hard'] 534 gyp_defines += ['arm_float_abi=hard']
535 if options.no_arm_trusted: 535 if options.no_arm_trusted:
536 gyp_defines.append('disable_cross_trusted=1') 536 gyp_defines.append('disable_cross_trusted=1')
537 if getos.GetPlatform() == 'mac': 537 if getos.GetPlatform() == 'mac':
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 BuildStepArchiveSDKTools() 1079 BuildStepArchiveSDKTools()
1080 1080
1081 return 0 1081 return 0
1082 1082
1083 1083
1084 if __name__ == '__main__': 1084 if __name__ == '__main__':
1085 try: 1085 try:
1086 sys.exit(main(sys.argv[1:])) 1086 sys.exit(main(sys.argv[1:]))
1087 except KeyboardInterrupt: 1087 except KeyboardInterrupt:
1088 buildbot_common.ErrorExit('build_sdk: interrupted') 1088 buildbot_common.ErrorExit('build_sdk: interrupted')
OLDNEW
« no previous file with comments | « native_client_sdk/src/build_tools/build_artifacts.py ('k') | native_client_sdk/src/build_tools/tests/build_artifacts_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698