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

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

Issue 590523002: Building both ia32 and x64 in the sdk build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
565 565
566 platform = getos.GetPlatform() 566 platform = getos.GetPlatform()
567 newlibdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_newlib') 567 newlibdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_newlib')
568 glibcdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_glibc') 568 glibcdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_glibc')
569 armdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_newlib') 569 armdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_newlib')
570 pnacldir = os.path.join(pepperdir, 'toolchain', platform + '_pnacl') 570 pnacldir = os.path.join(pepperdir, 'toolchain', platform + '_pnacl')
571 bionicdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_bionic') 571 bionicdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_bionic')
572 572
573 if set(toolchains) & set(['glibc', 'newlib']): 573 if set(toolchains) & set(['glibc', 'newlib']):
574 GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR) 574 GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR)
575 GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR)
575 576
576 if 'arm' in toolchains: 577 if 'arm' in toolchains:
577 GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm') 578 GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm')
578 579
579 GypNinjaInstall(pepperdir, toolchains) 580 GypNinjaInstall(pepperdir, toolchains)
580 581
581 if 'newlib' in toolchains: 582 if 'newlib' in toolchains:
582 InstallNaClHeaders(GetToolchainNaClInclude('newlib', newlibdir, 'x86'), 583 InstallNaClHeaders(GetToolchainNaClInclude('newlib', newlibdir, 'x86'),
583 'newlib') 584 'newlib')
584 585
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 BuildStepArchiveSDKTools() 1043 BuildStepArchiveSDKTools()
1043 1044
1044 return 0 1045 return 0
1045 1046
1046 1047
1047 if __name__ == '__main__': 1048 if __name__ == '__main__':
1048 try: 1049 try:
1049 sys.exit(main(sys.argv)) 1050 sys.exit(main(sys.argv))
1050 except KeyboardInterrupt: 1051 except KeyboardInterrupt:
1051 buildbot_common.ErrorExit('build_sdk: interrupted') 1052 buildbot_common.ErrorExit('build_sdk: interrupted')
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698