Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: native_client_sdk/src/tools/lib/get_shared_deps.py

Issue 1269623004: [NaCl SDK] Remove support for bionic toolchain (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « native_client_sdk/src/tools/create_nmf.py ('k') | native_client_sdk/src/tools/nacl_gcc.mk » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/tools/lib/get_shared_deps.py
diff --git a/native_client_sdk/src/tools/lib/get_shared_deps.py b/native_client_sdk/src/tools/lib/get_shared_deps.py
index 5a3a658f09bec8e779fd58f1608f1e4f20c8cf8c..5325df9e6af8bbf186dd74f689c25ae877a68a50 100644
--- a/native_client_sdk/src/tools/lib/get_shared_deps.py
+++ b/native_client_sdk/src/tools/lib/get_shared_deps.py
@@ -210,16 +210,9 @@ def _FindLibsInPath(name, 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 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:
+ # 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':
continue
filename = os.path.join(dirname, name)
if os.path.exists(filename):
« no previous file with comments | « native_client_sdk/src/tools/create_nmf.py ('k') | native_client_sdk/src/tools/nacl_gcc.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698