Consolidate handling of jar files in deps

PiperOrigin-RevId: 193533061

1 files changed, 9 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
index fdd0c26082..e209ebc23d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java
@@ -39,6 +39,7 @@ import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
 import com.google.devtools.build.lib.collect.nestedset.Order;
+import com.google.devtools.build.lib.rules.java.JavaCompilationArgs.ClasspathType;
 import com.google.devtools.build.lib.rules.java.JavaConfiguration.JavaClasspathMode;
 import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
@@ -708,12 +709,11 @@ public final class JavaCompilationHelper {
   }
 
   private void addLibrariesToAttributesInternal(Iterable<? extends TransitiveInfoCollection> deps) {
-    JavaCompilationArgs args = JavaCompilationArgs.builder()
-        .addTransitiveTargets(deps).build();
+    JavaCompilationArgs args =
+        JavaCompilationArgsProvider.legacyFromTargets(deps).getRecursiveJavaCompilationArgs();
 
-    NestedSet<Artifact> directJars = isStrict()
-        ? getNonRecursiveCompileTimeJarsFromCollection(deps)
-        : null;
+    NestedSet<Artifact> directJars =
+        isStrict() ? getNonRecursiveCompileTimeJarsFromCollection(deps) : null;
     addArgsAndJarsToAttributes(args, directJars);
   }
 
@@ -724,7 +724,10 @@ public final class JavaCompilationHelper {
   private NestedSet<Artifact> getNonRecursiveCompileTimeJarsFromCollection(
       Iterable<? extends TransitiveInfoCollection> deps) {
     JavaCompilationArgs.Builder builder = JavaCompilationArgs.builder();
-    builder.addTransitiveTargets(deps, /*recursive=*/false);
+    builder.addTransitiveCompilationArgs(
+        JavaCompilationArgsProvider.legacyFromTargets(deps),
+        /*recursive=*/ false,
+        ClasspathType.BOTH);
     return builder.build().getCompileTimeJars();
   }