Revert of [NaCl SDK] Remove support for bionic toolchain

native_client_sdk/src/build_tools/build_projects.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 import argparse
 import multiprocessing
 import os
 import posixpath
 import sys
@@ skipping 12 matching lines @@
 import getos
 
 
 MAKE = 'nacl_sdk/make_3.99.90-26-gf80222c/make.exe'
 LIB_DICT = {
   'linux': [],
   'mac': [],
   'win': ['x86_32']
 }
 VALID_TOOLCHAINS = [
+  'bionic',
   'newlib',
   'clang-newlib',
   'glibc',
   'pnacl',
   'win',
   'linux',
   'mac',
 ]
 
 # Global verbosity setting.
@@ skipping 162 matching lines @@
     # build.
     env['X86_32_CFLAGS'] = '-m32'
     env['X86_32_CXXFLAGS'] = '-m32'
     jobs = '50'
   else:
     jobs = str(multiprocessing.cpu_count())
 
   make_cmd = [make, '-j', jobs]
 
   make_cmd.append('CONFIG='+config)
+  # We always ENABLE_BIONIC in case we need it.  If neither --bionic nor
+  # -t bionic have been provided on the command line, then VALID_TOOLCHAINS
+  # will not contain a bionic target.
+  make_cmd.append('ENABLE_BIONIC=1')
   if not deps:
     make_cmd.append('IGNORE_DEPS=1')
 
   if verbose:
     make_cmd.append('V=1')
 
   if args:
     make_cmd += args
   else:
     make_cmd.append('TOOLCHAIN=all')
@@ skipping 19 matching lines @@
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument('-c', '--clobber',
       help='Clobber project directories before copying new files',
       action='store_true', default=False)
   parser.add_argument('-b', '--build',
       help='Build the projects. Otherwise the projects are only copied.',
       action='store_true')
   parser.add_argument('--config',
       help='Choose configuration to build (Debug or Release).  Builds both '
            'by default')
+  parser.add_argument('--bionic',
+      help='Enable bionic projects', action='store_true')
   parser.add_argument('-x', '--experimental',
       help='Build experimental projects', action='store_true')
   parser.add_argument('-t', '--toolchain',
       help='Build using toolchain. Can be passed more than once.',
       action='append', default=[])
   parser.add_argument('-d', '--dest',
       help='Select which build destinations (project types) are valid.',
       action='append')
   parser.add_argument('projects', nargs='*',
       help='Select which projects to build.')
@@ skipping 23 matching lines @@
 
   pepper_ver = str(int(build_version.ChromeMajorVersion()))
   pepperdir = os.path.join(OUT_DIR, 'pepper_' + pepper_ver)
 
   if not options.toolchain:
     # Order matters here: the default toolchain for an example's Makefile will
     # be the first toolchain in this list that is available in the example.
     # e.g. If an example supports newlib and glibc, then the default will be
     # newlib.
     options.toolchain = ['pnacl', 'newlib', 'glibc', 'host', 'clang-newlib']
+    if options.experimental or options.bionic:
+      options.toolchain.append('bionic')
 
   if 'host' in options.toolchain:
     options.toolchain.remove('host')
     options.toolchain.append(getos.GetPlatform())
     Trace('Adding platform: ' + getos.GetPlatform())
 
   ValidateToolchains(options.toolchain)
 
   filters = {}
   if options.toolchain:
@@ skipping 32 matching lines @@
 
 
 if __name__ == '__main__':
   script_name = os.path.basename(sys.argv[0])
   try:
     sys.exit(main(sys.argv[1:]))
   except parse_dsc.ValidationError as e:
     buildbot_common.ErrorExit('%s: %s' % (script_name, e))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('%s: interrupted' % script_name)