Revert of [NaCl SDK] Remove support for bionic toolchain

native_client_sdk/src/tools/create_nmf.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.
 
 """Tool for automatically creating .nmf files from .nexe/.pexe/.bc executables.
 
 As well as creating the nmf file this tool can also find and stage
 any shared libraries dependencies that the executables might have.
 """
@@ skipping 534 matching lines @@
 
     libpath += [
       'lib/glibc_x86_32/%s' % config_fallback,
       'lib/glibc_x86_64/%s' % config_fallback,
       'lib/glibc_arm/%s' % config_fallback,
       'ports/lib/glibc_x86_32/%s' % config_fallback,
       'ports/lib/glibc_x86_64/%s' % config_fallback,
       'ports/lib/glibc_arm/%s' % config_fallback,
     ]
 
+  bionic_dir = 'toolchain/%s_arm_bionic' % osname
+  if os.path.isdir(os.path.join(sdk_root, bionic_dir)):
+    libpath += [
+      '%s/arm-nacl/lib' % bionic_dir,
+      '%s/arm-nacl/usr/lib' % bionic_dir,
+      'lib/bionic_arm/%s' % config,
+    ]
   libpath = [os.path.normpath(p) for p in libpath]
   libpath = [os.path.join(sdk_root, p) for p in libpath]
   libpath.append(os.path.join(sdk_root, 'tools'))
   return libpath
 
 
 def main(args):
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument('-o', '--output', dest='output',
                       help='Write manifest file to FILE (default is stdout)',
@@ skipping 142 matching lines @@
 if __name__ == '__main__':
   try:
     rtn = main(sys.argv[1:])
   except Error, e:
     sys.stderr.write('%s: %s\n' % (os.path.basename(__file__), e))
     rtn = 1
   except KeyboardInterrupt:
     sys.stderr.write('%s: interrupted\n' % os.path.basename(__file__))
     rtn = 1
   sys.exit(rtn)