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

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

Issue 2338653002: [NaCl SDK] Disable building PNaCl component (Closed)
Patch Set: Created 4 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 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 # Ship with libraries prebuilt, so run that first. 846 # Ship with libraries prebuilt, so run that first.
847 BuildStepBuildLibraries(pepperdir) 847 BuildStepBuildLibraries(pepperdir)
848 GenerateNotice(pepperdir) 848 GenerateNotice(pepperdir)
849 849
850 # Verify the SDK contains what we expect. 850 # Verify the SDK contains what we expect.
851 BuildStepVerifyFilelist(pepperdir) 851 BuildStepVerifyFilelist(pepperdir)
852 852
853 if options.tar: 853 if options.tar:
854 BuildStepTarBundle(pepper_ver, tarfile) 854 BuildStepTarBundle(pepper_ver, tarfile)
855 855
856 if platform == 'linux': 856 # TODO(sbc): Re-enable this once we switch the pnacl component build
857 BuildStepBuildPNaClComponent(pepper_ver, chrome_revision) 857 # from gyp to gn:
858 # https://bugs.chromium.org/p/chromium/issues/detail?id=646241
859 #if platform == 'linux':
860 #BuildStepBuildPNaClComponent(pepper_ver, chrome_revision)
858 861
859 if options.build_app_engine and platform == 'linux': 862 if options.build_app_engine and platform == 'linux':
860 BuildStepBuildAppEngine(pepperdir, chrome_revision) 863 BuildStepBuildAppEngine(pepperdir, chrome_revision)
861 864
862 if options.qemu: 865 if options.qemu:
863 qemudir = os.path.join(NACL_DIR, 'toolchain', 'linux_arm-trusted') 866 qemudir = os.path.join(NACL_DIR, 'toolchain', 'linux_arm-trusted')
864 oshelpers.Copy(['-r', qemudir, pepperdir]) 867 oshelpers.Copy(['-r', qemudir, pepperdir])
865 868
866 # Archive the results on Google Cloud Storage. 869 # Archive the results on Google Cloud Storage.
867 if options.archive: 870 if options.archive:
868 BuildStepArchiveBundle('build', pepper_ver, chrome_revision, nacl_revision, 871 BuildStepArchiveBundle('build', pepper_ver, chrome_revision, nacl_revision,
869 tarfile) 872 tarfile)
870 # Only archive sdk_tools/naclport/pnacl_component on linux. 873 # Only archive sdk_tools/naclport/pnacl_component on linux.
871 if platform == 'linux': 874 if platform == 'linux':
872 BuildStepArchiveSDKTools() 875 BuildStepArchiveSDKTools()
873 BuildStepArchivePNaClComponent(chrome_revision) 876 #BuildStepArchivePNaClComponent(chrome_revision)
874 877
875 return 0 878 return 0
876 879
877 880
878 if __name__ == '__main__': 881 if __name__ == '__main__':
879 try: 882 try:
880 sys.exit(main(sys.argv[1:])) 883 sys.exit(main(sys.argv[1:]))
881 except KeyboardInterrupt: 884 except KeyboardInterrupt:
882 buildbot_common.ErrorExit('build_sdk: interrupted') 885 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