Add native libraries to gn apks

build/android/gyp/write_ordered_libraries.py

Index: build/android/gyp/write_ordered_libraries.py
diff --git a/build/android/gyp/write_ordered_libraries.py b/build/android/gyp/write_ordered_libraries.py
index 31aba74ccaf428e133c6167ab24aa2fcd5bafd59..954f12daef22518220be78874eaa7112972e695f 100755
--- a/build/android/gyp/write_ordered_libraries.py
+++ b/build/android/gyp/write_ordered_libraries.py
@@ -27,13 +27,26 @@ 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
@@ -47,9 +60,10 @@ def IsSystemLibrary(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)
 
 
@@ -91,17 +105,26 @@ def main():
   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()
+
+  SetReadelfPath(options.readelf)
+  SetLibraryDirs(options.libraries_dir.split(','))
 
-  libraries = build_utils.ParseGypList(_options.input_libraries)
+  libraries = build_utils.ParseGypList(options.input_libraries)
   if len(libraries):
     libraries = GetSortedTransitiveDependenciesForBinaries(libraries)
 
-  build_utils.WriteJson(libraries, _options.output, only_if_changed=True)
+  # Convert to "base" library names: e.g. libfoo.so -> foo
+  java_libraries_list = (
+      '{%s}' % ','.join(['"%s"' % s[3:-3] for s in libraries]))
+
+  build_utils.WriteJson(
+      {'libraries': libraries, 'java_libraries_list': java_libraries_list},
+      options.output,
+      only_if_changed=True)
 
-  if _options.stamp:
-    build_utils.Touch(_options.stamp)
+  if options.stamp:
+    build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':