Android: Move dep-related code to dep_utils.py

This CL mostly moves code from lookup_dep.py -> dep_utils.py so that it
is accessible by //build scripts. This paves the way to simplifying the
code in subsequent CLs and making use of it in bytecode_processor.py.

Bug: 1099522
Change-Id: Ia197e113a26b550a2a080c589ee23200fafe3767
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4567009
Commit-Queue: Mohamed Heikal <[email protected]>
Reviewed-by: Mohamed Heikal <[email protected]>
Auto-Submit: Peter Wen <[email protected]>
Commit-Queue: Peter Wen <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1149807}
NOKEYCHECK=True
GitOrigin-RevId: 4ba710110b52161201898c376e50cc62418e0052

Author: Peter Wen

android/gyp/bytecode_processor.py

@@ -13,8 +13,8 @@
 import sys
 from typing import Dict, List
 
-import javac_output_processor
 from util import build_utils
+from util import dep_utils
 from util import jar_utils
 from util import server_utils
 import action_helpers  # build_utils adds //build to sys.path.
@@ -215,7 +215,7 @@ def main(argv):
   args.full_classpath_jars = action_helpers.parse_gn_list(
       args.full_classpath_jars)
   args.full_classpath_gn_targets = [
-      javac_output_processor.ReplaceGmsPackageIfNeeded(t)
+      dep_utils.ReplaceGmsPackageIfNeeded(t)
       for t in action_helpers.parse_gn_list(args.full_classpath_gn_targets)
   ]
   args.missing_classes_allowlist = action_helpers.parse_gn_list(

android/gyp/bytecode_processor.pydeps

@@ -9,13 +9,6 @@
 ../../../third_party/catapult/devil/devil/android/sdk/version_codes.py
 ../../../third_party/catapult/devil/devil/constants/__init__.py
 ../../../third_party/catapult/devil/devil/constants/exit_codes.py
-../../../third_party/colorama/src/colorama/__init__.py
-../../../third_party/colorama/src/colorama/ansi.py
-../../../third_party/colorama/src/colorama/ansitowin32.py
-../../../third_party/colorama/src/colorama/initialise.py
-../../../third_party/colorama/src/colorama/win32.py
-../../../third_party/colorama/src/colorama/winterm.py
-../../../tools/android/modularization/convenience/lookup_dep.py
 ../../../tools/android/modularization/gn/dep_operations.py
 ../../../tools/android/modularization/gn/json_gn_editor.py
 ../../../tools/android/modularization/gn/utils.py
@@ -28,8 +21,8 @@
 ../pylib/__init__.py
 ../pylib/constants/__init__.py
 bytecode_processor.py
-javac_output_processor.py
 util/__init__.py
 util/build_utils.py
+util/dep_utils.py
 util/jar_utils.py
 util/server_utils.py

android/gyp/compile_java.pydeps

@@ -15,7 +15,6 @@
 ../../../third_party/colorama/src/colorama/initialise.py
 ../../../third_party/colorama/src/colorama/win32.py
 ../../../third_party/colorama/src/colorama/winterm.py
-../../../tools/android/modularization/convenience/lookup_dep.py
 ../../action_helpers.py
 ../../gn_helpers.py
 ../../print_python_deps.py
@@ -27,6 +26,7 @@ compile_java.py
 javac_output_processor.py
 util/__init__.py
 util/build_utils.py
+util/dep_utils.py
 util/jar_info_utils.py
 util/jar_utils.py
 util/md5_check.py

android/gyp/compile_kt.pydeps

@@ -15,7 +15,6 @@
 ../../../third_party/colorama/src/colorama/initialise.py
 ../../../third_party/colorama/src/colorama/win32.py
 ../../../third_party/colorama/src/colorama/winterm.py
-../../../tools/android/modularization/convenience/lookup_dep.py
 ../../action_helpers.py
 ../../gn_helpers.py
 ../../print_python_deps.py
@@ -28,6 +27,7 @@ compile_kt.py
 javac_output_processor.py
 util/__init__.py
 util/build_utils.py
+util/dep_utils.py
 util/jar_info_utils.py
 util/jar_utils.py
 util/md5_check.py

android/gyp/javac_output_processor.py

@@ -5,62 +5,19 @@
 # found in the LICENSE file.
 """Contains helper class for processing javac output."""
 
-import dataclasses
 import os
 import pathlib
 import re
 import sys
 import traceback
-from typing import List
 
 from util import build_utils
+from util import dep_utils
 
 sys.path.insert(
     0,
     os.path.join(build_utils.DIR_SOURCE_ROOT, 'third_party', 'colorama', 'src'))
 import colorama
-sys.path.insert(
-    0,
-    os.path.join(build_utils.DIR_SOURCE_ROOT, 'tools', 'android',
-                 'modularization', 'convenience'))
-import lookup_dep
-
-
-def ReplaceGmsPackageIfNeeded(target_name: str) -> str:
-  if target_name.startswith(
-      ('//third_party/android_deps:google_play_services_',
-       '//clank/third_party/google3:google_play_services_')):
-    return f'$google_play_services_package:{target_name.split(":")[1]}'
-  return target_name
-
-
-def _DisambiguateDeps(class_entries: List[lookup_dep.ClassEntry]):
-  def filter_if_not_empty(entries, filter_func):
-    filtered_entries = [e for e in entries if filter_func(e)]
-    return filtered_entries or entries
-
-  # When some deps are preferred, ignore all other potential deps.
-  class_entries = filter_if_not_empty(class_entries, lambda e: e.preferred_dep)
-
-  # E.g. javax_annotation_jsr250_api_java.
-  class_entries = filter_if_not_empty(class_entries,
-                                      lambda e: 'jsr' in e.target)
-
-  # Avoid suggesting subtargets when regular targets exist.
-  class_entries = filter_if_not_empty(class_entries,
-                                      lambda e: '__' not in e.target)
-
-  # Swap out GMS package names if needed.
-  class_entries = [
-      dataclasses.replace(e, target=ReplaceGmsPackageIfNeeded(e.target))
-      for e in class_entries
-  ]
-
-  # Convert to dict and then use list to get the keys back to remove dups and
-  # keep order the same as before.
-  class_entries = list({e: True for e in class_entries})
-
-  return class_entries
 
 
 class JavacOutputProcessor:
@@ -181,7 +138,7 @@ def _LookForUnknownSymbol(self, line, next_line):
       return
 
     if self._class_lookup_index is None:
-      self._class_lookup_index = lookup_dep.ClassLookupIndex(
+      self._class_lookup_index = dep_utils.ClassLookupIndex(
           pathlib.Path(os.getcwd()),
           should_build=False,
       )
@@ -192,7 +149,7 @@ def _LookForUnknownSymbol(self, line, next_line):
     if not suggested_deps:
       return
 
-    suggested_deps = _DisambiguateDeps(suggested_deps)
+    suggested_deps = dep_utils.DisambiguateDeps(suggested_deps)
     suggested_deps_str = ', '.join(s.target for s in suggested_deps)
 
     if len(suggested_deps) > 1:

android/gyp/turbine.pydeps

@@ -15,7 +15,6 @@
 ../../../third_party/colorama/src/colorama/initialise.py
 ../../../third_party/colorama/src/colorama/win32.py
 ../../../third_party/colorama/src/colorama/winterm.py
-../../../tools/android/modularization/convenience/lookup_dep.py
 ../../action_helpers.py
 ../../gn_helpers.py
 ../../print_python_deps.py
@@ -28,6 +27,7 @@ javac_output_processor.py
 turbine.py
 util/__init__.py
 util/build_utils.py
+util/dep_utils.py
 util/jar_info_utils.py
 util/jar_utils.py
 util/md5_check.py

android/gyp/util/build_utils.py

@@ -12,7 +12,6 @@
 import json
 import logging
 import os
-import pipes
 import re
 import shlex
 import shutil
@@ -21,7 +20,6 @@
 import sys
 import tempfile
 import textwrap
-import time
 import zipfile
 
 sys.path.append(os.path.join(os.path.dirname(__file__),