[NaCl SDK] Fix create_nmf on dynamic bionic nexes

native_client_sdk/src/tools/lib/get_shared_deps.py

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 99a5884bdd26b66a32634cc9da9df343a5d6d895..b7b433f1d5b2671023f35be33b025cb41b818a01 100644
--- a/native_client_sdk/src/tools/lib/get_shared_deps.py
+++ b/native_client_sdk/src/tools/lib/get_shared_deps.py
@@ -21,6 +21,9 @@ import subprocess
 
 import elf
 
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+SDK_DIR = os.path.dirname(os.path.dirname(SCRIPT_DIR))
+
 NeededMatcher = re.compile('^ *NEEDED *([^ ]+)\n$')
 FormatMatcher = re.compile('^(.+):\\s*file format (.+)\n$')
 
@@ -211,7 +214,8 @@ def _FindLibsInPath(name, lib_path):
     # TODO(noelallen): 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
-    if name == 'libc.so' and 'bionic' not in dirname:
+    rel_dirname = os.path.relpath(dirname, SDK_DIR)
+    if name == 'libc.so' and 'bionic' not in rel_dirname:

[Sam Clegg, 2014/06/18 18:21:30]

Why not just update the check to "_arm_bionic"?

Then this CL is just a single line.

[binji, 2014/06/18 18:29:35]

Because the problem would pop up again if the user renames their directory.
Unlikely, but why not just fix it the right way?

[Sam Clegg, 2014/06/18 18:36:23]

Ok.  I guess I was thinking that this check horrible fragile anyway, but I guess
it is actually less fragile your way.

[binji, 2014/06/18 18:39:51]

You're right, it's a hack either way. :) The real fix is specified in the TODO.

       continue
     filename = os.path.join(dirname, name)
     if os.path.exists(filename):