Fix java_group() handling in write_build_config.py.

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 73 matching lines @@
 def DepsOfType(wanted_type, configs):
   return [c for c in configs if c['type'] == wanted_type]
 
 
 def GetAllDepsConfigsInOrder(deps_config_paths):
   def GetDeps(path):
     return set(GetDepConfig(path)['deps_configs'])
   return build_utils.GetSortedTransitiveDependencies(deps_config_paths, GetDeps)
 
 
-def ResolveGroups(configs):
-  while True:
-    groups = DepsOfType('group', configs)
-    if not groups:
-      return configs
-    for config in groups:
-      index = configs.index(config)
-      expanded_configs = [GetDepConfig(p) for p in config['deps_configs']]
-      configs[index:index + 1] = expanded_configs
-
-
 class Deps(object):
   def __init__(self, direct_deps_config_paths):
     self.all_deps_config_paths = GetAllDepsConfigsInOrder(
         direct_deps_config_paths)
-    self.direct_deps_configs = ResolveGroups(
-        [GetDepConfig(p) for p in direct_deps_config_paths])
+    self.direct_deps_configs = [
+        GetDepConfig(p) for p in direct_deps_config_paths]
     self.all_deps_configs = [
         GetDepConfig(p) for p in self.all_deps_config_paths]
     self.direct_deps_config_paths = direct_deps_config_paths
 
   def All(self, wanted_type=None):
     if type is None:
       return self.all_deps_configs
     return DepsOfType(wanted_type, self.all_deps_configs)
 
   def Direct(self, wanted_type=None):
@@ skipping 46 matching lines @@
 
   def create_list(asset_map):
     ret = ['%s:%s' % (src, dest) for dest, src in asset_map.iteritems()]
     # Sort to ensure deterministic ordering.
     ret.sort()
     return ret
 
   return create_list(compressed), create_list(uncompressed)
 
 
-def _FilterUnwantedDepsPaths(dep_paths, target_type):
+def _ResolveGroups(configs):
+  """Returns a list of configs with all groups inlined."""
+  ret = list(configs)
+  while True:
+    groups = DepsOfType('group', ret)
+    if not groups:
+      return ret
+    for config in groups:
+      index = ret.index(config)
+      expanded_configs = [GetDepConfig(p) for p in config['deps_configs']]
+      ret[index:index + 1] = expanded_configs
+
+
+def _FilterDepsPaths(dep_paths, target_type):
+  """Resolves all groups and trims dependency branches that we never want.
+
+  E.g. When a resource or asset depends on an apk target, the intent is to
+  include the .apk as a resource/asset, not to have the apk's classpath added.

[Ian Wen, 2016/07/14 17:14:53]

This makes so much sense! Thanks for the comment!

+  """
+  configs = [GetDepConfig(p) for p in dep_paths]
+  configs = _ResolveGroups(configs)
   # Don't allow root targets to be considered as a dep.
-  ret = [p for p in dep_paths if GetDepConfig(p)['type'] not in _ROOT_TYPES]
+  configs = [c for c in configs if c['type'] not in _ROOT_TYPES]
 
   # Don't allow java libraries to cross through assets/resources.
   if target_type in _RESOURCE_TYPES:
-    ret = [p for p in ret if GetDepConfig(p)['type'] in _RESOURCE_TYPES]
-  return ret
+    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 = []
   for path in runtime_deps_files:
     with open(path) as f:
@@ skipping 105 matching lines @@
 
   if options.type == 'java_library':
     if options.supports_android and not options.dex_path:
       raise Exception('java_library that supports Android requires a dex path.')
 
     if options.requires_android and not options.supports_android:
       raise Exception(
           '--supports-android is required when using --requires-android')
 
   direct_deps_config_paths = build_utils.ParseGypList(options.deps_configs)
-  direct_deps_config_paths = _FilterUnwantedDepsPaths(direct_deps_config_paths,
-                                                      options.type)
+  direct_deps_config_paths = _FilterDepsPaths(direct_deps_config_paths,
+                                              options.type)
 
   deps = Deps(direct_deps_config_paths)
   all_inputs = deps.AllConfigPaths() + build_utils.GetPythonDependencies()
 
   # Remove other locale resources if there is alternative_locale_resource in
   # direct deps.
   if options.has_alternative_locale_resource:
     alternative = [r['path'] for r in deps.Direct('android_resources')
                    if r.get('is_locale_resource')]
     # We can only have one locale resources in direct deps.
@@ skipping 268 matching lines @@
         _MergeAssets(deps.All('android_assets')))
 
   build_utils.WriteJson(config, options.build_config, only_if_changed=True)
 
   if options.depfile:
     build_utils.WriteDepfile(options.depfile, all_inputs)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))