Reland #3 "Android: Refactor write_build_config.py"

This reverts commit 4f141ffbfc24fe79b6f1d8596212818f12c07fb6.

Reason for reland: Fixed missing keys for dist_arr()

Original change's description:
> Revert "Reland #2 "Android: Refactor write_build_config.py""
>
> This reverts commit 4bc21e8413d1d01f2b1bf474cbb7fa6811b40528.
>
> Change-Id: I5523850ad9fb072919d354d2ab9383feeb8852c6
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6680571
> Reviewed-by: Andrew Grieve <[email protected]>
> Owners-Override: Andrew Grieve <[email protected]>
> Commit-Queue: Andrew Grieve <[email protected]>
> Cr-Commit-Position: refs/heads/main@{#1479597}

Change-Id: I6cd1ea3edeaeefca9d6d765d9b13b6c7ad54c931
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6681236
Commit-Queue: Andrew Grieve <[email protected]>
Reviewed-by: Sam Maier <[email protected]>
Owners-Override: Andrew Grieve <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1479826}
NOKEYCHECK=True
GitOrigin-RevId: 8a6674346207b0d060fa98cf2f0eb1008c835e81

Author: agrieve

android/PRESUBMIT.py

@@ -98,7 +98,6 @@ def J(*dirs):
       J('gyp', 'java_cpp_features_tests.py'),
       J('gyp', 'java_cpp_strings_tests.py'),
       J('gyp', 'java_google_api_keys_tests.py'),
-      J('gyp', 'util', 'build_utils_test.py'),
       J('gyp', 'util', 'manifest_utils_test.py'),
       J('gyp', 'util', 'md5_check_test.py'),
       J('gyp', 'util', 'resource_utils_test.py'),

android/gradle/generate_gradle.py

@@ -158,9 +158,9 @@ def FromGnTarget(cls, gn_target):
     return cls._cached_entries[gn_target]
 
   @classmethod
-  def FromBuildConfigPath(cls, path):
+  def FromParamsJsonPath(cls, path):
     prefix = 'gen/'
-    suffix = '.build_config.json'
+    suffix = '.params.json'
     assert path.startswith(prefix) and path.endswith(suffix), path
     subdir = path[len(prefix):-len(suffix)]
     gn_target = '//%s:%s' % (os.path.split(subdir))
@@ -249,9 +249,12 @@ def AllEntries(self):
     This includes the entry itself to make iterating simpler."""
     if self._all_entries is None:
       logging.debug('Generating entries for %s', self.GnTarget())
-      deps = [_ProjectEntry.FromBuildConfigPath(p)
-          for p in self.Gradle()['dependent_android_projects']]
-      deps.extend(_ProjectEntry.FromBuildConfigPath(p)
+      deps = [
+          _ProjectEntry.FromParamsJsonPath(p)
+          for p in self.Gradle()['dependent_android_projects']
+      ]
+      deps.extend(
+          _ProjectEntry.FromParamsJsonPath(p)
           for p in self.Gradle()['dependent_java_projects'])
       all_entries = set()
       for dep in deps:
@@ -369,11 +372,15 @@ def Generate(self, root_entry):
     self.processed_res_dirs.update(res_dirs)
     variables['res_dirs'] = self._Relativize(root_entry, res_dirs)
     if self.split_projects:
-      deps = [_ProjectEntry.FromBuildConfigPath(p)
-              for p in root_entry.Gradle()['dependent_android_projects']]
+      deps = [
+          _ProjectEntry.FromParamsJsonPath(p)
+          for p in root_entry.Gradle()['dependent_android_projects']
+      ]
       variables['android_project_deps'] = [d.ProjectName() for d in deps]
-      deps = [_ProjectEntry.FromBuildConfigPath(p)
-              for p in root_entry.Gradle()['dependent_java_projects']]
+      deps = [
+          _ProjectEntry.FromParamsJsonPath(p)
+          for p in root_entry.Gradle()['dependent_java_projects']
+      ]
       variables['java_project_deps'] = [d.ProjectName() for d in deps]
     return variables
 
@@ -725,7 +732,7 @@ def _FindAllProjectEntries(main_entries):
     found.add(cur_entry)
     sub_config_paths = cur_entry.BuildConfig()['deps_configs']
     to_scan.extend(
-        _ProjectEntry.FromBuildConfigPath(p) for p in sub_config_paths)
+        _ProjectEntry.FromParamsJsonPath(p) for p in sub_config_paths)
   return list(found)
 
 

android/gyp/util/build_utils.py

@@ -5,7 +5,6 @@
 """Contains common helpers for GN action()s."""
 
 import atexit
-import collections
 import contextlib
 import fnmatch
 import json
@@ -327,34 +326,6 @@ def MatchesGlob(path, filters):
   return filters and any(fnmatch.fnmatch(path, f) for f in filters)
 
 
-def GetSortedTransitiveDependencies(top, deps_func):
-  """Gets the list of all transitive dependencies in sorted order.
-
-  There should be no cycles in the dependency graph (crashes if cycles exist).
-
-  Args:
-    top: A list of the top level nodes
-    deps_func: A function that takes a node and returns a list of its direct
-        dependencies.
-  Returns:
-    A list of all transitive dependencies of nodes in top, in order (a node will
-    appear in the list at a higher index than all of its dependencies).
-  """
-  # Find all deps depth-first, maintaining original order in the case of ties.
-  deps_map = collections.OrderedDict()
-
-  def discover(nodes):
-    for node in nodes:
-      if node in deps_map:
-        continue
-      deps = deps_func(node)
-      discover(deps)
-      deps_map[node] = deps
-
-  discover(top)
-  return list(deps_map)
-
-
 def InitLogging(enabling_env):
   logging.basicConfig(
       level=logging.DEBUG if os.environ.get(enabling_env) else logging.WARNING,