[NaCl SDK] Fix bionic SDK build

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 109 matching lines @@
 def GetGypBuiltLib(tcname, arch):
   if arch == 'ia32':
     lib_suffix = '32'
   elif arch == 'x64':
     lib_suffix = '64'
   elif arch == 'arm':
     lib_suffix = 'arm'
   else:
     lib_suffix = ''
 
-  tcdir = 'tc_' + GetToolchainLibc(tcname)
+  if tcname == 'arm_bionic':
+    tcdir = 'tc_newlib'
+  else:
+    tcdir = 'tc_' + GetToolchainLibc(tcname)
 
   if tcname == 'pnacl':
     if arch is None:
       lib_suffix = ''
       tcdir = 'tc_pnacl_newlib'
       arch = 'x64'
     else:
       arch = 'clang-' + arch
 
   return os.path.join(GetNinjaOutDir(arch), 'gen', tcdir, 'lib' + lib_suffix)
@@ skipping 1017 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')