Revert of [NaCl SDK] Remove support for bionic toolchain

native_client_sdk/src/tools/lib/get_shared_deps.py

 # 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.
 
 """Helper script to close over all transitive dependencies of a given .nexe
 executable.
 
 e.g. Given
 A -> B
 B -> C
@@ skipping 192 matching lines @@
 
   Args:
     name: name of library to find
     lib_path: A list of paths to search for shared libraries.
 
   Returns:
     A list of system paths that match the given name within the lib_path'''
   files = []
   for dirname in lib_path:
     # The libc.so files in the the glibc toolchain is actually a linker
-    # script which references libc.so.<SHA1>.  This means the libc.so itself
-    # does not end up in the NEEDED section for glibc.
-    if name == 'libc.so':
+    # script which references libc.so.<SHA1>.  This means the lib.so itself
+    # does not end up in the NEEDED section for glibc.  However with bionic
+    # the SONAME is actually libc.so.  If we pass glibc's libc.so to objdump
+    # if fails to parse it, os this filters out libc.so expept for within
+    # the bionic toolchain.
+    # TODO(bradnelson): Remove this once the SONAME in bionic is made to be
+    # unique in the same it is under glibc:
+    # https://code.google.com/p/nativeclient/issues/detail?id=3833
+    rel_dirname = os.path.relpath(dirname, SDK_DIR)
+    if name == 'libc.so' and 'bionic' not in rel_dirname:
       continue
     filename = os.path.join(dirname, name)
     if os.path.exists(filename):
       files.append(filename)
   if not files:
     raise Error('cannot find library %s' % name)
   return files
 
 
 def _GetNeededStatic(main_files):
   needed = {}
   for filename in main_files:
     arch = elf.ParseElfHeader(filename)[0]
     needed[filename] = arch
   return needed