[NaCl SDK] Fix create_nmf on dynamic bionic nexes

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
 B -> D
 C -> E
 
 where "A -> B" means A depends on B, then GetNeeded(A) will return A, B, C, D
 and E.
 """
 
 import os
 import re
 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$')
 
 RUNNABLE_LD = 'runnable-ld.so'  # Name of the dynamic loader
 
 OBJDUMP_ARCH_MAP = {
     # Names returned by Linux's objdump:
     'elf64-x86-64': 'x86-64',
     'elf32-i386': 'x86-32',
     'elf32-little': 'arm',
@@ skipping 170 matching lines @@
   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(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):
       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