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}
NOKEYCHECK=True
GitOrigin-RevId: 4f141ffbfc24fe79b6f1d8596212818f12c07fb6

Author: Simeon Anfinrud

android/PRESUBMIT.py

@@ -98,6 +98,7 @@ 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 FromParamsJsonPath(cls, path):
+  def FromBuildConfigPath(cls, path):
     prefix = 'gen/'
-    suffix = '.params.json'
+    suffix = '.build_config.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,12 +249,9 @@ 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.FromParamsJsonPath(p)
-          for p in self.Gradle()['dependent_android_projects']
-      ]
-      deps.extend(
-          _ProjectEntry.FromParamsJsonPath(p)
+      deps = [_ProjectEntry.FromBuildConfigPath(p)
+          for p in self.Gradle()['dependent_android_projects']]
+      deps.extend(_ProjectEntry.FromBuildConfigPath(p)
           for p in self.Gradle()['dependent_java_projects'])
       all_entries = set()
       for dep in deps:
@@ -372,15 +369,11 @@ 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.FromParamsJsonPath(p)
-          for p in root_entry.Gradle()['dependent_android_projects']
-      ]
+      deps = [_ProjectEntry.FromBuildConfigPath(p)
+              for p in root_entry.Gradle()['dependent_android_projects']]
       variables['android_project_deps'] = [d.ProjectName() for d in deps]
-      deps = [
-          _ProjectEntry.FromParamsJsonPath(p)
-          for p in root_entry.Gradle()['dependent_java_projects']
-      ]
+      deps = [_ProjectEntry.FromBuildConfigPath(p)
+              for p in root_entry.Gradle()['dependent_java_projects']]
       variables['java_project_deps'] = [d.ProjectName() for d in deps]
     return variables
 
@@ -732,7 +725,7 @@ def _FindAllProjectEntries(main_entries):
     found.add(cur_entry)
     sub_config_paths = cur_entry.BuildConfig()['deps_configs']
     to_scan.extend(
-        _ProjectEntry.FromParamsJsonPath(p) for p in sub_config_paths)
+        _ProjectEntry.FromBuildConfigPath(p) for p in sub_config_paths)
   return list(found)
 
 

android/gyp/util/build_utils.py

@@ -5,6 +5,7 @@
 """Contains common helpers for GN action()s."""
 
 import atexit
+import collections
 import contextlib
 import fnmatch
 import json
@@ -326,6 +327,34 @@ 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,

android/gyp/util/build_utils_test.py

@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+# Copyright 2018 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import collections
+import os
+import sys
+import unittest
+
+sys.path.insert(
+    0, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)))
+from util import build_utils
+
+_DEPS = collections.OrderedDict()
+_DEPS['a'] = []
+_DEPS['b'] = []
+_DEPS['c'] = ['a']
+_DEPS['d'] = ['a']
+_DEPS['e'] = ['f']
+_DEPS['f'] = ['a', 'd']
+_DEPS['g'] = []
+_DEPS['h'] = ['d', 'b', 'f']
+_DEPS['i'] = ['f']
+
+
+class BuildUtilsTest(unittest.TestCase):
+  def testGetSortedTransitiveDependencies_all(self):
+    TOP = _DEPS.keys()
+    EXPECTED = ['a', 'b', 'c', 'd', 'f', 'e', 'g', 'h', 'i']
+    actual = build_utils.GetSortedTransitiveDependencies(TOP, _DEPS.get)
+    self.assertEqual(EXPECTED, actual)
+
+  def testGetSortedTransitiveDependencies_leaves(self):
+    TOP = ['c', 'e', 'g', 'h', 'i']
+    EXPECTED = ['a', 'c', 'd', 'f', 'e', 'g', 'b', 'h', 'i']
+    actual = build_utils.GetSortedTransitiveDependencies(TOP, _DEPS.get)
+    self.assertEqual(EXPECTED, actual)
+
+  def testGetSortedTransitiveDependencies_leavesReverse(self):
+    TOP = ['i', 'h', 'g', 'e', 'c']
+    EXPECTED = ['a', 'd', 'f', 'i', 'b', 'h', 'g', 'e', 'c']
+    actual = build_utils.GetSortedTransitiveDependencies(TOP, _DEPS.get)
+    self.assertEqual(EXPECTED, actual)
+
+
+if __name__ == '__main__':
+  unittest.main()