Add option BIONIC toolchain to NaCl SDK output

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 54 matching lines @@
   tcname = 'toolchain_%s_x86.tar.bz2' % getos.GetPlatform()
   return os.path.join(tcdir, tcname)
 
 
 def GetNewlibToolchain():
   tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars')
   tcname = 'naclsdk_%s_x86.tgz' % getos.GetPlatform()
   return os.path.join(tcdir, tcname)
 
 
+def GetBionicToolchain():
+  tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars')
+  tcname = 'naclsdk_%s_arm_bionic.tgz' % getos.GetPlatform()
+  return os.path.join(tcdir, tcname)
+
+
 def GetPNaClToolchain():
   tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars')
   tcname = 'naclsdk_pnacl_%s_x86.tgz' % getos.GetPlatform()
   return os.path.join(tcdir, tcname)
 
 
 def GetToolchainNaClInclude(tcname, tcpath, arch):
   if arch == 'x86':
     if tcname == 'pnacl':
       return os.path.join(tcpath, 'sdk', 'include')
@@ skipping 51 matching lines @@
                         GetToolchainDirName(tcname, xarch))
   return GetToolchainNaClLib(tcname, tcpath, xarch)
 
 
 def GetPNaClNativeLib(tcpath, arch):
   if arch not in ['arm', 'x86-32', 'x86-64']:
     buildbot_common.ErrorExit('Unknown architecture %s.' % arch)
   return os.path.join(tcpath, 'lib-' + arch)
 
 
-def BuildStepDownloadToolchains():
+def BuildStepDownloadToolchains(toolchains):
   buildbot_common.BuildStep('Running download_toolchains.py')
   download_script = os.path.join('build', 'download_toolchains.py')
-  buildbot_common.Run([sys.executable, download_script,
-                      '--no-arm-trusted', '--arm-untrusted', '--keep'],
-                      cwd=NACL_DIR)
+  args = [sys.executable, download_script, '--no-arm-trusted',
+          '--arm-untrusted', '--keep']
+  if 'bionic' in toolchains:
+    args.append('--allow-bionic')
+  buildbot_common.Run(args, cwd=NACL_DIR)
 
 
 def BuildStepCleanPepperDirs(pepperdir, pepperdir_old):
   buildbot_common.BuildStep('Clean Pepper Dirs')
   buildbot_common.RemoveDir(pepperdir_old)
   buildbot_common.RemoveDir(pepperdir)
   buildbot_common.MakeDir(pepperdir)
 
 
 def BuildStepMakePepperDirs(pepperdir, subdirs):
@@ skipping 51 matching lines @@
     tarfile = GetNewlibToolchain()
     buildbot_common.Run([sys.executable, CYGTAR, '-C', tmpdir, '-xf', tarfile],
                         cwd=NACL_DIR)
 
     # Then rename/move it to the pepper toolchain directory
     srcdir = os.path.join(tmpdir, 'sdk', 'nacl-sdk')
     tcname = platform + '_x86_newlib'
     newlibdir = os.path.join(pepperdir, 'toolchain', tcname)
     buildbot_common.Move(srcdir, newlibdir)
 
+  if 'bionic' in toolchains:
+    # Untar the bionic toolchains
+    tarfile = GetBionicToolchain()
+    tcname = platform + '_arm_bionic'
+    buildbot_common.Run([sys.executable, CYGTAR, '-C', tmpdir, '-xf', tarfile],
+                        cwd=NACL_DIR)
+    srcdir = os.path.join(tmpdir, tcname)
+    bionicdir = os.path.join(pepperdir, 'toolchain', tcname)
+    buildbot_common.Move(srcdir, bionicdir)
+
   if 'arm' in toolchains:
     # Copy the existing arm toolchain from native_client tree
     tcname = platform + '_arm_newlib'
     arm_toolchain = os.path.join(NACL_DIR, 'toolchain', tcname)
     arm_toolchain_sdk = os.path.join(pepperdir, 'toolchain',
                                      os.path.basename(arm_toolchain))
     buildbot_common.CopyDir(arm_toolchain, arm_toolchain_sdk)
 
   if 'glibc' in toolchains:
     # Untar the glibc toolchains
@@ skipping 644 matching lines @@
   buildbot_common.BuildStep('Build GoNaCl AppEngine Projects')
   cmd = ['make', 'upload', 'REVISION=%s' % chrome_revision]
   env = dict(os.environ)
   env['NACL_SDK_ROOT'] = pepperdir
   env['NACLPORTS_NO_ANNOTATE'] = "1"
   buildbot_common.Run(cmd, env=env, cwd=GONACL_APPENGINE_SRC_DIR)
 
 
 def main(args):
   parser = optparse.OptionParser()
+  parser.add_option('--bionic', help='Add bionic build.',
+      action='store_true')

[Sam Clegg, 2014/02/18 20:27:21]

I think this (and some of the lines below) fits on a single line.

   parser.add_option('--tar', help='Force the tar step.',
       action='store_true')
   parser.add_option('--archive', help='Force the archive step.',
       action='store_true')
   parser.add_option('--gyp',
       help='Use gyp to build examples/libraries/Makefiles.',
       action='store_true')
   parser.add_option('--release', help='PPAPI release version.',
       dest='release', default=None)
   parser.add_option('--build-ports',
@@ skipping 23 matching lines @@
     parser.error("Unexpected arguments: %s" % str(args))
 
   generate_make.use_gyp = options.gyp
   if buildbot_common.IsSDKBuilder():
     options.archive = True
     options.build_ports = True
     options.build_app_engine = True
     options.tar = True
 
   toolchains = ['newlib', 'glibc', 'arm', 'pnacl', 'host']
+  if options.bionic:
+    toolchains.append('bionic')
+
   print 'Building: ' + ' '.join(toolchains)
 
   if options.archive and not options.tar:
     parser.error('Incompatible arguments with archive.')
 
   chrome_version = int(build_version.ChromeMajorVersion())
   chrome_revision = build_version.ChromeRevision()
   nacl_revision = build_version.NaClRevision()
   pepper_ver = str(chrome_version)
   pepper_old = str(chrome_version - 1)
   pepperdir = os.path.join(OUT_DIR, 'pepper_' + pepper_ver)
   pepperdir_old = os.path.join(OUT_DIR, 'pepper_' + pepper_old)
   tarname = 'naclsdk_' + getos.GetPlatform() + '.tar.bz2'
   tarfile = os.path.join(OUT_DIR, tarname)
 
   if options.release:
     pepper_ver = options.release
   print 'Building PEPPER %s at %s' % (pepper_ver, chrome_revision)
 
   if 'NACL_SDK_ROOT' in os.environ:
     # We don't want the currently configured NACL_SDK_ROOT to have any effect
     # of the build.
     del os.environ['NACL_SDK_ROOT']
 
   if not options.skip_toolchain:
     BuildStepCleanPepperDirs(pepperdir, pepperdir_old)
     BuildStepMakePepperDirs(pepperdir, ['include', 'toolchain', 'tools'])
-    BuildStepDownloadToolchains()
+    BuildStepDownloadToolchains(toolchains)
     BuildStepUntarToolchains(pepperdir, toolchains)
 
   BuildStepBuildToolchains(pepperdir, toolchains)
 
   BuildStepUpdateHelpers(pepperdir, True)
   BuildStepUpdateUserProjects(pepperdir, toolchains,
                               options.build_experimental, True)
 
   BuildStepCopyTextFiles(pepperdir, pepper_ver, chrome_revision, nacl_revision)
 
@@ skipping 27 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')