[NaCl SDK] Teach create_nmf about ARM shared libraries.

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 510 matching lines @@
     # naclports installed libraries
     'toolchain/%s_x86_glibc/x86_64-nacl/usr/lib' % osname,
     'toolchain/%s_x86_glibc/i686-nacl/usr/lib' % osname,
     # SDK bundle libraries
     'lib/glibc_x86_32/%s' % config,
     'lib/glibc_x86_64/%s' % config,
     # naclports bundle libraries
     'ports/lib/glibc_x86_32/%s' % config,
     'ports/lib/glibc_x86_64/%s' % config,
   ]
+
+  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

[binji, 2014/04/07 20:16:56]

Wouldn't it be safer to include the bionic search paths after the glibc ones?

[Sam Clegg, 2014/04/07 20:41:35]

Done.

   libpath = [os.path.normpath(p) for p in libpath]
   libpath = [os.path.join(sdk_root, p) for p in libpath]
   return libpath
 
 
 def main(argv):
   parser = optparse.OptionParser(
       usage='Usage: %prog [options] nexe [extra_libs...]', description=__doc__)
   parser.add_option('-o', '--output', dest='output',
                     help='Write manifest file to FILE (default is stdout)',
@@ skipping 85 matching lines @@
   for libpath in options.lib_path:
     if not os.path.exists(libpath):
       sys.stderr.write('Specified library path does not exist: %s\n' % libpath)
     elif not os.path.isdir(libpath):
       sys.stderr.write('Specified library is not a directory: %s\n' % libpath)
 
   if not options.no_default_libpath:
     # Add default libraries paths to the end of the search path.
     config = options.debug_libs and 'Debug' or 'Release'
     options.lib_path += GetDefaultLibPath(config)
+    for path in options.lib_path:
+      Trace('libpath: %s' % path)
 
   pnacl_optlevel = None
   if options.pnacl_optlevel is not None:
     pnacl_optlevel = int(options.pnacl_optlevel)
     if pnacl_optlevel < 0 or pnacl_optlevel > 3:
       sys.stderr.write(
           'warning: PNaCl optlevel %d is unsupported (< 0 or > 3)\n' %
           pnacl_optlevel)
   if options.pnacl_debug_optlevel is not None:
     pnacl_debug_optlevel = int(options.pnacl_debug_optlevel)
@@ skipping 32 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)