More runtime dependency artifact cleanup

--
MOS_MIGRATED_REVID=112273574

3 files changed, 10 insertions, 30 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 032a324dfc..04aa86392c 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
@@ -420,17 +420,14 @@ public class JavaCompilationHelper extends BaseJavaCompilationHelper {
         .build().getCompileTimeJars();
   }
 
-  private void addDependencyArtifactsToAttributes(
-      Iterable<? extends TransitiveInfoCollection> deps) {
-    NestedSetBuilder<Artifact> compileTimeBuilder = NestedSetBuilder.stableOrder();
-    NestedSetBuilder<Artifact> runTimeBuilder = NestedSetBuilder.stableOrder();
-    for (JavaCompilationArgsProvider provider : AnalysisUtils.getProviders(
-        deps, JavaCompilationArgsProvider.class)) {
-      compileTimeBuilder.addTransitive(provider.getCompileTimeJavaDependencyArtifacts());
-      runTimeBuilder.addTransitive(provider.getRunTimeJavaDependencyArtifacts());
+  static void addDependencyArtifactsToAttributes(
+      JavaTargetAttributes.Builder attributes,
+      Iterable<? extends JavaCompilationArgsProvider> deps) {
+    NestedSetBuilder<Artifact> result = NestedSetBuilder.stableOrder();
+    for (JavaCompilationArgsProvider provider : deps) {
+      result.addTransitive(provider.getCompileTimeJavaDependencyArtifacts());
     }
-    attributes.addCompileTimeDependencyArtifacts(compileTimeBuilder.build());
-    attributes.addRuntimeDependencyArtifacts(runTimeBuilder.build());
+    attributes.addCompileTimeDependencyArtifacts(result.build());
   }
 
   /**
@@ -449,7 +446,8 @@ public class JavaCompilationHelper extends BaseJavaCompilationHelper {
 
     JavaClasspathMode classpathMode = getJavaConfiguration().getReduceJavaClasspath();
     if (isStrict() && classpathMode != JavaClasspathMode.OFF) {
-      addDependencyArtifactsToAttributes(deps);
+      addDependencyArtifactsToAttributes(
+          attributes, AnalysisUtils.getProviders(deps, JavaCompilationArgsProvider.class));
     }
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
index a8f1b373f4..9ef2fa00a0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibraryHelper.java
@@ -244,7 +244,7 @@ public final class JavaLibraryHelper {
     attributes.setTargetLabel(ruleContext.getLabel());
 
     if (isStrict() && classpathMode != JavaClasspathMode.OFF) {
-      addDependencyArtifactsToAttributes(attributes);
+      JavaCompilationHelper.addDependencyArtifactsToAttributes(attributes, transformDeps());
     }
 
     JavaCompilationArtifacts.Builder artifactsBuilder = new JavaCompilationArtifacts.Builder();
@@ -298,17 +298,6 @@ public final class JavaLibraryHelper {
     return builder.build().getCompileTimeJars();
   }
 
-  private void addDependencyArtifactsToAttributes(JavaTargetAttributes.Builder attributes) {
-    NestedSetBuilder<Artifact> compileTimeBuilder = NestedSetBuilder.stableOrder();
-    NestedSetBuilder<Artifact> runTimeBuilder = NestedSetBuilder.stableOrder();
-    for (JavaCompilationArgsProvider dep : transformDeps()) {
-      compileTimeBuilder.addTransitive(dep.getCompileTimeJavaDependencyArtifacts());
-      runTimeBuilder.addTransitive(dep.getRunTimeJavaDependencyArtifacts());
-    }
-    attributes.addCompileTimeDependencyArtifacts(compileTimeBuilder.build());
-    attributes.addRuntimeDependencyArtifacts(runTimeBuilder.build());
-  }
-
   private Iterable<JavaCompilationArgsProvider> transformDeps() {
     return Iterables.transform(deps, TO_COMPILATION_ARGS);
   }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java
index f5b8d4d58b..3a28c203be 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java
@@ -85,7 +85,6 @@ public class JavaTargetAttributes {
         BuildConfiguration.StrictDepsMode.OFF;
     private final List<Artifact> directJars = new ArrayList<>();
     private final List<Artifact> compileTimeDependencyArtifacts = new ArrayList<>();
-    private final List<Artifact> runtimeDependencyArtifacts = new ArrayList<>();
     private String ruleKind;
     private Label targetLabel;
 
@@ -255,12 +254,6 @@ public class JavaTargetAttributes {
       return this;
     }
 
-    public Builder addRuntimeDependencyArtifacts(Iterable<Artifact> dependencyArtifacts) {
-      Preconditions.checkArgument(!built);
-      Iterables.addAll(this.runtimeDependencyArtifacts, dependencyArtifacts);
-      return this;
-    }
-
     public Builder addInstrumentationMetadataEntries(Iterable<Artifact> metadataEntries) {
       Preconditions.checkArgument(!built);
       Iterables.addAll(instrumentationMetadata, metadataEntries);