Only list direct deps as java libraries

build/android/gyp/write_build_config.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Writes a build_config file.
 
 The build_config file for a target is a json file containing information about
 how to build that target based on the target's dependencies. This includes
@@ skipping 180 matching lines @@
   if target_type in _RESOURCE_TYPES:
     configs = [c for c in configs if c['type'] in _RESOURCE_TYPES]
   return [c['path'] for c in configs]
 
 
 def _AsInterfaceJar(jar_path):
   return jar_path[:-3] + 'interface.jar'
 
 
 def _ExtractSharedLibsFromRuntimeDeps(runtime_deps_files):
-  ret = []
+  """Returns sorted direct and all deps.

[agrieve, 2016/10/26 19:46:18]

Not sure this makes sense. How about:

Returns a tuple of (root_libs, all_libs).

+  """
+  all_deps = set()
+  direct_deps = []
   for path in runtime_deps_files:
     with open(path) as f:
+      first_line = True
       for line in f:
         line = line.rstrip()
-        if not line.endswith('.so'):
+        if first_line:
+          if not line.endswith('.so'):
+            raise Exception('Wrong runtime deps file %s' % path)
+          direct_deps.append(os.path.normpath(line))
+          first_line = False
+        elif not line.endswith('.so'):
           continue
-        ret.append(os.path.normpath(line))
-  ret.reverse()
-  return ret
+        all_deps.add(os.path.normpath(line))
+  return sorted(direct_deps), sorted(all_deps)
 
 
 def _CreateJavaLibrariesList(library_paths):
   """Returns a java literal array with the "base" library names:
   e.g. libfoo.so -> foo
   """
-  return ('{%s}' % ','.join(['"%s"' % s[3:-3] for s in library_paths]))
+  return ('{%s}' % ','.join(['"%s"' % os.path.basename(s)[3:-3]
+             for s in library_paths]))
 
 
 def _CreateLocalePaksAssetJavaList(assets):
   """Returns a java literal array from a list of assets in the form src:dst."""
   names_only = (a.split(':')[1][:-4] for a in assets if a.endswith('.pak'))
   locales_only = (a for a in names_only if '-' in a or len(a) == 2)
   return '{%s}' % ','.join(sorted('"%s"' % a for a in locales_only))
 
 
 def main(argv):
@@ skipping 389 matching lines @@
     deps_info['package_name'] = manifest.GetPackageName()
     if not options.tested_apk_config and manifest.GetInstrumentation():
       # This must then have instrumentation only for itself.
       manifest.CheckInstrumentation(manifest.GetPackageName())
 
     library_paths = []
     java_libraries_list = None
     runtime_deps_files = build_utils.ParseGnList(
         options.shared_libraries_runtime_deps or '[]')
     if runtime_deps_files:
-      library_paths = _ExtractSharedLibsFromRuntimeDeps(runtime_deps_files)
-      java_libraries_list = _CreateJavaLibrariesList(library_paths)
+      direct_dep_libs, library_paths = _ExtractSharedLibsFromRuntimeDeps(
+          runtime_deps_files)
+      java_libraries_list = _CreateJavaLibrariesList(direct_dep_libs)
 
     secondary_abi_library_paths = []
     secondary_abi_java_libraries_list = None
     secondary_abi_runtime_deps_files = build_utils.ParseGnList(
         options.secondary_abi_shared_libraries_runtime_deps or '[]')
     if secondary_abi_runtime_deps_files:
-      secondary_abi_library_paths = _ExtractSharedLibsFromRuntimeDeps(
+      (secondary_abi_direct_dep_libs,
+       secondary_abi_library_paths) = _ExtractSharedLibsFromRuntimeDeps(
           secondary_abi_runtime_deps_files)
       secondary_abi_java_libraries_list = _CreateJavaLibrariesList(
-          secondary_abi_library_paths)
+          secondary_abi_direct_dep_libs)
+      if java_libraries_list != secondary_abi_java_libraries_list:
+        raise Exception('Secondary abi library list should same as primary one.'
+            ' Secondary abi: %s, primary abi:%s'
+             % (secondary_abi_java_libraries_list, java_libraries_list))
 
     all_inputs.extend(runtime_deps_files)
     config['native'] = {
       'libraries': library_paths,
       'secondary_abi_libraries': secondary_abi_library_paths,
       'java_libraries_list': java_libraries_list,
       'secondary_abi_java_libraries_list': secondary_abi_java_libraries_list,
     }
     config['assets'], config['uncompressed_assets'] = (
         _MergeAssets(deps.All('android_assets')))
     config['compressed_locales_java_list'] = (
         _CreateLocalePaksAssetJavaList(config['assets']))
     config['uncompressed_locales_java_list'] = (
         _CreateLocalePaksAssetJavaList(config['uncompressed_assets']))
 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile, options.build_config, all_inputs)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))