Add true dependency graph to java-info.txt files (#7506)

1. This is need to work out `.proto` file runtime variant usage
   correctly

2. and later this will turn into compile dependency graph only allowing
   to reduce the number of `.jar` files indexed.

Bug: 395576137
Bug: 327638725
Test: n/a
Change-Id: I58c04b20fb4f067bed15074433869437857fbd79

AOSP: 1c883dae2e5ac5155683e4012dff5e6af4054d51

Co-authored-by: Googler <[email protected]>

Author: LeFrosch

aspect/build_dependencies.bzl

@@ -139,6 +139,7 @@ DependenciesInfo = provider(
     "The out-of-project dependencies",
     fields = {
         "label": "the label of a target it describes",
+        "java_info_file": "a file containing java related info",
         "java_info_files": "a list of java info files",
         "compile_time_jars": "a list of jars generated by targets",
         "target_to_artifacts": "a map between a target and all its artifacts",
@@ -156,6 +157,7 @@ DependenciesInfo = provider(
 
 def create_dependencies_info(
         label,
+        java_info_file = None,
         java_info_files = depset(),
         compile_time_jars = depset(),
         target_to_artifacts = {},
@@ -171,6 +173,7 @@ def create_dependencies_info(
     """A helper function to create a DependenciesInfo provider instance."""
     return DependenciesInfo(
         label = label,
+        java_info_file = java_info_file,
         java_info_files = java_info_files,
         compile_time_jars = compile_time_jars,
         target_to_artifacts = target_to_artifacts,
@@ -186,17 +189,19 @@ def create_dependencies_info(
     )
 
 def create_java_dependencies_info(
-        compile_time_jars,
+        info_file,
         info_files,
+        compile_time_jars,
         target_to_artifacts,
         aars,
         gensrcs,
         expand_sources,
         test_mode_own_files):
     """A helper function to create a DependenciesInfo provider instance."""
     return struct(
-        compile_time_jars = compile_time_jars,
+        info_file = info_file,
         info_files = info_files,
+        compile_time_jars = compile_time_jars,
         target_to_artifacts = target_to_artifacts,
         aars = aars,
         gensrcs = gensrcs,
@@ -269,6 +274,7 @@ def merge_dependencies_info(
 
     merged = create_dependencies_info(
         label = target.label,
+        java_info_file = java_dep_info.info_file if java_dep_info else None,
         java_info_files = java_dep_info.info_files if experiment_multi_info_file and java_dep_info else None,
         compile_time_jars = java_dep_info.compile_time_jars if java_dep_info else None,
         target_to_artifacts = java_dep_info.target_to_artifacts if not experiment_multi_info_file and java_dep_info else None,
@@ -306,6 +312,7 @@ def _encode_target_info_proto(target_to_artifacts):
         contents.append(
             struct(
                 target = label,
+                dep_java_info_files = _encode_file_list(target_info["dep_java_info_files"] if "dep_java_info_files" in target_info else []),
                 jars = _encode_file_list(target_info["jars"]) if "jars" in target_info else [],
                 ide_aars = _encode_file_list(target_info["ide_aars"]),
                 gen_srcs = _encode_file_list(target_info["gen_srcs"]),
@@ -662,13 +669,15 @@ def _collect_own_java_artifacts(
     )
 
 def _target_to_artifact_entry(
+        dep_java_info_files = [],
         jars = [],
         ide_aars = [],
         gen_srcs = [],
         srcs = [],
         srcjars = [],
         android_resources_package = ""):
     return {
+        "dep_java_info_files": dep_java_info_files,
         "jars": jars,
         "ide_aars": ide_aars,
         "gen_srcs": gen_srcs,
@@ -707,10 +716,12 @@ def _collect_own_and_dependency_java_artifacts(
     target_to_artifacts = {}
 
     # Flattening is fine here as these are files from a single target (maybe some are re-exported from a few of its dependencies).
+    dep_java_info_files = [info.java_info_file for info in dependency_infos.values() if info.java_info_file]
     jars = own_files.jar_depset.to_list()
     ide_aars = own_files.ide_aar_depset.to_list()
     gen_srcs = own_files.gensrc_depset.to_list()  # Flattening is fine here (these are files from one target)
     target_to_artifacts[str(target.label)] = _target_to_artifact_entry(
+        dep_java_info_files = dep_java_info_files,  # No flattening here. This is a list of direct dependencies only.
         jars = jars,
         ide_aars = ide_aars,
         gen_srcs = gen_srcs,
@@ -858,11 +869,12 @@ def _collect_java_dependencies_core_impl(
         if "ij-ignore-source-transform" in ctx.rule.attr.tags:
             expand_sources = True
 
-    java_info_file = []
+    java_info_file = None
     if params.experiment_multi_info_file:
         java_info_file = _write_java_target_info(target.label, target_to_artifacts, ctx)
 
     return create_java_dependencies_info(
+        info_file = java_info_file if params.experiment_multi_info_file else None,
         info_files = depset([java_info_file], transitive = [d.java_info_files for d in dependency_infos.values()]) if params.experiment_multi_info_file else None,
         target_to_artifacts = target_to_artifacts if not params.experiment_multi_info_file else None,
         compile_time_jars = compile_jars,

base/src/com/google/idea/blaze/base/qsync/BazelDependencyBuilder.java

@@ -536,7 +536,8 @@ private CcCompilationInfo readCcInfoFile(ByteSource file) throws BuildException
         readArtifactInfoProtoFile(CcCompilationInfo.newBuilder(), file).build());
   }
 
-  protected <B extends Message.Builder> B readArtifactInfoProtoFile(B builder, ByteSource file)
+  @VisibleForTesting
+  public static <B extends Message.Builder> B readArtifactInfoProtoFile(B builder, ByteSource file)
       throws BuildException {
     try (InputStream inputStream = file.openStream()) {
       TextFormat.Parser parser = TextFormat.Parser.newBuilder().build();

querysync/java/com/google/idea/blaze/qsync/artifacts/BUILD

@@ -29,6 +29,7 @@ proto_library(
     visibility = [
         "//querysync/java/com/google/idea/blaze/qsync/cc:__pkg__",
         "//querysync/java/com/google/idea/blaze/qsync/java:__pkg__",
+        "//third_party/google/aswb/javatests/com/google/devtools/intellij/blaze/plugin/aswb:__subpackages__",
     ],
 )
 

querysync/java/com/google/idea/blaze/qsync/java/java_target_info.proto

@@ -31,6 +31,7 @@ message JavaTargetArtifacts {
   repeated OutputArtifact gen_srcs = 6;
   repeated string srcjars = 7;          // Workspace relative
   string android_resources_package = 8; // Package that this target places its Android R class in
+  repeated OutputArtifact dep_java_info_files = 9;  // Workspace relative
 }
 
 // The list of all java targets built and their artifacts. Note that because