Add native libraries to gn apks

build/android/gyp/write_ordered_libraries.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Writes dependency ordered list of native libraries.
 
 The list excludes any Android system libraries, as those are not bundled with
 the APK.
 
 This list of libraries is used for several steps of building an APK.
 In the component build, the --input-libraries only needs to be the top-level
 library (i.e. libcontent_shell_content_view). This will then use readelf to
 inspect the shared libraries and determine the full list of (non-system)
 libraries that should be included in the APK.
 """
 
 # TODO(cjhopman): See if we can expose the list of library dependencies from
 # gyp, rather than calculating it ourselves.
 # http://crbug.com/225558
 
 import optparse
 import os
 import re
 import sys
 
 from util import build_utils
 
-_options = None
+_readelf = None
+_library_dirs = None
+
 _library_re = re.compile(
     '.*NEEDED.*Shared library: \[(?P<library_name>[\w/.]+)\]')
 
 
+def SetReadelfPath(path):
+  global _readelf
+  _readelf = path
+
+
+def SetLibraryDirs(dirs):
+  global _library_dirs
+  _library_dirs = dirs
+
+
 def FullLibraryPath(library_name):
-  for directory in _options.libraries_dir.split(','):
+  assert _library_dirs is not None
+  for directory in _library_dirs:
     path = '%s/%s' % (directory, library_name)
     if os.path.exists(path):
       return path
   return library_name
 
 
 def IsSystemLibrary(library_name):
   # If the library doesn't exist in the libraries directory, assume that it is
   # an Android system library.
   return not os.path.exists(FullLibraryPath(library_name))
 
 
 def CallReadElf(library_or_executable):
-  readelf_cmd = [_options.readelf,
+  assert _readelf is not None
+  readelf_cmd = [_readelf,
                  '-d',
-                 library_or_executable]
+                 FullLibraryPath(library_or_executable)]
   return build_utils.CheckOutput(readelf_cmd)
 
 
 def GetDependencies(library_or_executable):
   elf = CallReadElf(library_or_executable)
   return set(_library_re.findall(elf))
 
 
 def GetNonSystemDependencies(library_name):
   all_deps = GetDependencies(FullLibraryPath(library_name))
@@ skipping 21 matching lines @@
   parser = optparse.OptionParser()
 
   parser.add_option('--input-libraries',
       help='A list of top-level input libraries.')
   parser.add_option('--libraries-dir',
       help='The directory which contains shared libraries.')
   parser.add_option('--readelf', help='Path to the readelf binary.')
   parser.add_option('--output', help='Path to the generated .json file.')
   parser.add_option('--stamp', help='Path to touch on success.')
 
-  global _options
-  _options, _ = parser.parse_args()
+  options, _ = parser.parse_args()
 
-  libraries = build_utils.ParseGypList(_options.input_libraries)
+  SetReadelfPath(options.readelf)
+  SetLibraryDirs(options.libraries_dir.split(','))
+
+  libraries = build_utils.ParseGypList(options.input_libraries)
   if len(libraries):
     libraries = GetSortedTransitiveDependenciesForBinaries(libraries)
 
-  build_utils.WriteJson(libraries, _options.output, only_if_changed=True)
+  libraries_string = '{%s}' % ','.join(['"%s"' % s[3:-3] for s in libraries])

[newt (away), 2014/08/11 23:55:23]

what are you stripping away here with "s[3:-3]"?

[cjhopman, 2014/08/18 01:21:12]

Done.

 
-  if _options.stamp:
-    build_utils.Touch(_options.stamp)
+  build_utils.WriteJson(
+      {'libraries': libraries, 'java_libraries_list': libraries_string},
+      options.output,
+      only_if_changed=True)
+
+  if options.stamp:
+    build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main())