[NaCl SDK] Remove newlib toolchain from the SDK

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 47 matching lines @@
 
 NACLPORTS_URL = 'https://chromium.googlesource.com/external/naclports.git'
 NACLPORTS_REV = '65c71c1524a74ff8415573e5e5ef7c59ce4ac437'
 
 GYPBUILD_DIR = 'gypbuild'
 
 options = None
 
 # Map of: ToolchainName: (PackageName, SDKDir, arch).
 TOOLCHAIN_PACKAGE_MAP = {
-    'arm_newlib': ('nacl_arm_newlib', '%(platform)s_arm_newlib', 'arm'),
     'arm_glibc': ('nacl_arm_glibc', '%(platform)s_arm_glibc', 'arm'),
-    'x86_newlib': ('nacl_x86_newlib', '%(platform)s_x86_newlib', 'x86'),
     'x86_glibc': ('nacl_x86_glibc', '%(platform)s_x86_glibc', 'x86'),
     'arm_bionic': ('nacl_arm_bionic', '%(platform)s_arm_bionic', 'arm'),
     'pnacl': ('pnacl_newlib', '%(platform)s_pnacl', 'pnacl')
     }
 
 
 def GetToolchainDirName(tcname):
   """Return the directory name for a given toolchain"""
   return TOOLCHAIN_PACKAGE_MAP[tcname][1] % {'platform': getos.GetPlatform()}
 
@@ skipping 364 matching lines @@
     ]
     InstallFiles(GetNinjaOutDir('arm'), tools_dir, arm_files)
 
   for tc in toolchains:
     if tc in ('host', 'clang-newlib'):
       continue
     elif tc == 'pnacl':
       xarches = (None, 'ia32', 'x64', 'arm')
     elif tc in ('x86_glibc', 'x86_newlib'):
       xarches = ('ia32', 'x64')
-    elif tc in ('arm_glibc', 'arm_newlib', 'arm_bionic'):
+    elif tc in ('arm_glibc', 'arm_bionic'):
       xarches = ('arm',)
     else:
       raise AssertionError('unexpected toolchain value: %s' % tc)
 
     for xarch in xarches:
       src_dir = GetGypBuiltLib(tc, xarch)
       dst_dir = GetOutputToolchainLib(pepperdir, tc, xarch)
       libc = GetToolchainLibc(tc)
       InstallFiles(src_dir, dst_dir, TOOLCHAIN_LIBS[libc])
 
@@ skipping 124 matching lines @@
   if build:
     GypNinjaBuild_NaCl(GYPBUILD_DIR)
     GypNinjaBuild_Breakpad(GYPBUILD_DIR + '-x64')
 
     if set(toolchains) & set(['x86_glibc', 'x86_newlib']):
       GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR + '-ia32',
                           ['use_nacl_clang=0'])
       GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR + '-x64',
                           ['use_nacl_clang=0'])
 
-    if set(toolchains) & set(['arm_glibc', 'arm_newlib']):
+    if 'arm_glibc' in toolchains:
       GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-arm',
                           ['use_nacl_clang=0'] )
 
     if 'pnacl' in toolchains:
       GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR + '-clang-ia32',
                           ['use_nacl_clang=1'])
       GypNinjaBuild_PPAPI('x64', GYPBUILD_DIR + '-clang-x64',
                           ['use_nacl_clang=1'])
       GypNinjaBuild_PPAPI('arm', GYPBUILD_DIR + '-clang-arm',
                           ['use_nacl_clang=1'])
@@ skipping 335 matching lines @@
   if buildbot_common.IsSDKBuilder():
     options.archive = True
     # TODO(binji): re-enable app_engine build when the linux builder stops
     # breaking when trying to git clone from github.
     # See http://crbug.com/412969.
     options.build_app_engine = False
     options.tar = True
 
   # NOTE: order matters here. This will be the order that is specified in the
   # Makefiles; the first toolchain will be the default.
-  toolchains = ['pnacl', 'x86_newlib', 'x86_glibc', 'arm_newlib', 'arm_glibc',
-                'clang-newlib', 'host']
+  toolchains = ['pnacl', 'x86_glibc', 'arm_glibc', 'clang-newlib', 'host']
 
   # Changes for experimental bionic builder
   if options.bionic:
     toolchains.append('arm_bionic')
     options.build_app_engine = False
 
   print 'Building: ' + ' '.join(toolchains)
   platform = getos.GetPlatform()
 
   if options.archive and not options.tar:
@@ skipping 111 matching lines @@
       BuildStepArchivePNaClComponent(chrome_revision)
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')