Fix java_group() handling in write_build_config.py.

build/android/gyp/write_build_config.py

Index: build/android/gyp/write_build_config.py
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py
index 9f5e3e3af15b8fe3b357f590672bf313d93c01b2..b0c8c3a74c12a7080bd15ed85d335f91e854027d 100755
--- a/build/android/gyp/write_build_config.py
+++ b/build/android/gyp/write_build_config.py
@@ -91,23 +91,12 @@ def GetAllDepsConfigsInOrder(deps_config_paths):
   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
@@ -174,14 +163,28 @@ def _MergeAssets(all_assets):
   return create_list(compressed), create_list(uncompressed)
 
 
-def _FilterUnwantedDepsPaths(dep_paths, target_type):
+def _ResolveGroups(configs):
+  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

[Ian Wen, 2016/07/14 04:04:55]

IIUC, this removes "group" from "deps_config" of a target and inserts the
"deps_config" of the "group" to the target, right?

[agrieve, 2016/07/14 13:22:02]

Exactly. Certainly seems deserving of a comment, doesn't it! Added one.

+
+
+def _FilterDepsPaths(dep_paths, target_type):
+  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]

[Ian Wen, 2016/07/14 04:04:55]

Sorry I have a million questions... :P

Doesn't this mean that a resource target still cannot reference a java target?

Also, why was it designed that android resources target cannot depend on java
libraries?

[agrieve, 2016/07/14 13:22:02]

Added a comment to this function as well. That is still the case, and it's
desirable. However, an aar (which is a java_group) can depend on another aar,
and this will result in its resources depending on the other one's resources,
and the java_prebuilt depending on both the resources and the other
java_prebuilt.

+  return [c['path'] for c in configs]
 
 
 def _AsInterfaceJar(jar_path):
@@ -305,8 +308,8 @@ def main(argv):
           '--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()