[NaCl SDK] Remove newlib toolchain from the SDK

native_client_sdk/src/build_tools/build_artifacts.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Script to build binary components of the SDK.
 
 This script builds binary components of the Native Client SDK, create tarballs
 for them, and uploads them to Google Cloud Storage.
 
@@ skipping 35 matching lines @@
 
 PLATFORM = getos.GetPlatform()
 TAR = oshelpers.FindExeInPath('tar')
 options = None
 all_archives = []
 
 
 # Mapping from toolchain name to the equivalent package_version.py directory
 # name.
 TOOLCHAIN_PACKAGE_MAP = {
-    'newlib': 'nacl_x86_newlib',
-    'bionic': 'nacl_arm_bionic',
-    'arm': 'nacl_arm_newlib',
-    'glibc': 'nacl_x86_glibc',
+    'glibc_x86': 'nacl_x86_glibc',
+    'glibc_arm': 'nacl_arm_glibc',
     'pnacl': 'pnacl_newlib'}
 
 
 def Tar(archive_path, root, files):
   if os.path.exists(TAR):
     cmd = [TAR]
   else:
     cmd = [sys.executable, CYGTAR]
   cmd.extend(['-cjf', archive_path])
   cmd.extend(files)
@@ skipping 253 matching lines @@
     return os.path.join(tcpath, 'x86_64-nacl', 'lib32')
   elif xarch == 'x86_64':
     return os.path.join(tcpath, 'x86_64-nacl', 'lib')
   elif xarch == 'arm':
     return os.path.join(tcpath, 'arm-nacl', 'lib')
 
 
 def GetGypBuiltLib(root, tcname, xarch=None):
   if tcname == 'pnacl':
     tcname = 'pnacl_newlib'
+  if tcname in ('glibc_arm', 'glibc_x86'):
+    tcname = 'glibc'
   if xarch == 'x86_32':
     xarch = '32'
   elif xarch == 'x86_64':
     xarch = '64'
   elif not xarch:
     xarch = ''
   return os.path.join(root, 'Release', 'gen', 'tc_' + tcname, 'lib' + xarch)
 
 
 def GetGypToolchainLib(root, tcname, xarch):
-  if xarch == 'arm':
-    toolchain = xarch
-  else:
-    toolchain = tcname
-
   tcpath = os.path.join(root, 'Release', 'gen', 'sdk', '%s_x86' % PLATFORM,
-                        TOOLCHAIN_PACKAGE_MAP[toolchain])
+                        TOOLCHAIN_PACKAGE_MAP[tcname])
   return GetToolchainNaClLib(tcname, tcpath, xarch)
 
 
 def MakeGypArchives():
   join = os.path.join
   gyp_chromium = join(SRC_DIR, 'build', 'gyp_chromium')
   # TODO(binji): gyp_nacl doesn't build properly on Windows anymore; it only
   # can use VS2010, not VS2013 which is now required by the Chromium repo. NaCl
   # needs to be updated to perform the same logic as Chromium in detecting VS,
   # which can now exist in the depot_tools directory.
@@ skipping 35 matching lines @@
   archive.Copy(join(tmpdir, 'Release'), GetToolsFiles())
   archive.Copy(join(tmpdir_64, 'Release'), GetTools64Files())
   if PLATFORM == 'linux':
     archive.Copy(join(tmpdir_arm, 'Release'), GetToolsArmFiles())
   # TODO(binji): dump_syms doesn't currently build on Windows. See
   # http://crbug.com/245456
   if PLATFORM != 'win':
     archive.Copy(join(tmpdir, 'Release'), breakpad_targets)
   archive.Tar()
 
-  # newlib x86 libs archives
-  for arch in ('x86_32', 'x86_64'):
-    archive = Archive('newlib_%s_libs' % arch)
-    archive.Copy(GetGypBuiltLib(tmpdir, 'newlib', arch),
-                      GetNewlibToolchainLibs())
-    archive.Copy(GetGypToolchainLib(tmpdir, 'newlib', arch), 'crt1.o')
-    archive.Tar()
-
-  # newlib arm libs archive
-  archive = Archive('newlib_arm_libs')
-  archive.Copy(GetGypBuiltLib(tmpdir_arm, 'newlib', 'arm'),
-                    GetNewlibToolchainLibs())
-  archive.Copy(GetGypToolchainLib(tmpdir_arm, 'newlib', 'arm'), 'crt1.o')
-  archive.Tar()
-
   # glibc x86 libs archives
   for arch in ('x86_32', 'x86_64'):
     archive = Archive('glibc_%s_libs' % arch)
     archive.Copy(GetGypBuiltLib(tmpdir, 'glibc', arch), GetGlibcToolchainLibs())
     archive.Copy(GetGypToolchainLib(tmpdir, 'glibc', arch), 'crt1.o')
     archive.Tar()
 
   # pnacl libs archive
   archive = Archive('pnacl_libs')
   archive.Copy(GetGypBuiltLib(tmpdir, 'pnacl'), GetPNaClToolchainLibs())
   archive.Tar()
 
-  if PLATFORM == 'linux':
-    # bionic arm libs archive (use newlib-built files)
-    archive = Archive('bionic_arm_libs')
-    archive.Copy(GetGypBuiltLib(tmpdir_arm, 'newlib', 'arm'),
-                      GetBionicToolchainLibs())
-    archive.Copy(GetGypToolchainLib(tmpdir_arm, 'newlib', 'arm'), 'crt1.o')
-    archive.Tar()
-
   # Destroy the temporary directories
   tmpdir_obj.Destroy()
   tmpdirarm_obj.Destroy()
   tmpdir64_obj.Destroy()
 
 
 def MakePNaClArchives():
   join = os.path.join
   gyp_chromium = join(SRC_DIR, 'build', 'gyp_chromium')
   pnacl_irt_shim_gyp = join(SRC_DIR, 'ppapi', 'native_client', 'src',
@@ skipping 54 matching lines @@
 
 def MakeToolchainHeaderArchives():
   archive = Archive('newlib_headers')
   archive.Copy(SRC_DIR, GetNewlibHeaders())
   archive.Tar()
 
   archive = Archive('glibc_headers')
   archive.Copy(SRC_DIR, GetGlibcHeaders())
   archive.Tar()
 
-  if PLATFORM == 'linux':
-    archive = Archive('bionic_headers')
-    archive.Copy(SRC_DIR, GetBionicHeaders())
-    archive.Tar()
-
 
 def MakePepperArchive():
   archive = Archive('ppapi')
   archive.Copy(os.path.join(SRC_DIR, 'ppapi'), ['c', 'cpp', 'lib', 'utility'])
   archive.Tar()
 
 
 def UploadArchives():
   major_version = build_version.ChromeMajorVersion()
   chrome_revision = build_version.ChromeRevision()
@@ skipping 31 matching lines @@
   parser.add_argument('--mac-sdk',
       help='Set the mac-sdk (e.g. 10.6) to use when building with ninja.')
   parser.add_argument('--no-arm-trusted', action='store_true',
       help='Disable building of ARM trusted components (sel_ldr, etc).')
   parser.add_argument('--upload', action='store_true',
                       help='Upload tarballs to GCS.')
 
   global options
   options = parser.parse_args(args)
 
-  toolchains = ['pnacl', 'newlib', 'glibc', 'arm']
-  if PLATFORM == 'linux':
-    toolchains.append('bionic')
+  toolchains = ['pnacl', 'glibc_x86', 'glibc_arm']
 
   MakeVersionJson()
   for tc in toolchains:
     MakeToolchainArchive(tc)
   MakeGypArchives()
   MakePNaClArchives()
   MakeToolchainHeaderArchives()
   MakePepperArchive()
   if options.upload:
     UploadArchives()
 
   return 0
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_artifacts: interrupted')