Remove vestiges of support for 'reduced runtime classpaths'

PiperOrigin-RevId: 192914109

7 files changed, 9 insertions, 33 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 3afc7687d7..2ab240f110 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -721,10 +721,7 @@ public class AndroidCommon {
     JavaSourceJarsProvider sourceJarsProvider = javaSourceJarsProviderBuilder.build();
     JavaCompilationArgsProvider compilationArgsProvider =
         JavaCompilationArgsProvider.create(
-            javaCompilationArgs,
-            recursiveJavaCompilationArgs,
-            compileTimeDependencyArtifacts,
-            NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER));
+            javaCompilationArgs, recursiveJavaCompilationArgs, compileTimeDependencyArtifacts);
 
     JavaInfo.Builder javaInfoBuilder = JavaInfo.Builder.create();
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationArgsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationArgsProvider.java
index 2c3816b58f..de476e970d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationArgsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationArgsProvider.java
@@ -35,13 +35,9 @@ public abstract class JavaCompilationArgsProvider implements TransitiveInfoProvi
   public static JavaCompilationArgsProvider create(
       JavaCompilationArgs javaCompilationArgs,
       JavaCompilationArgs recursiveJavaCompilationArgs,
-      NestedSet<Artifact> compileTimeJavaDependencyArtifacts,
-      NestedSet<Artifact> runTimeJavaDependencyArtifacts) {
+      NestedSet<Artifact> compileTimeJavaDependencyArtifacts) {
     return new AutoValue_JavaCompilationArgsProvider(
-        javaCompilationArgs,
-        recursiveJavaCompilationArgs,
-        compileTimeJavaDependencyArtifacts,
-        runTimeJavaDependencyArtifacts);
+        javaCompilationArgs, recursiveJavaCompilationArgs, compileTimeJavaDependencyArtifacts);
   }
 
   public static JavaCompilationArgsProvider create(
@@ -50,7 +46,6 @@ public abstract class JavaCompilationArgsProvider implements TransitiveInfoProvi
     return create(
         javaCompilationArgs,
         recursiveJavaCompilationArgs,
-        NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER),
         NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER));
   }
 
@@ -82,12 +77,6 @@ public abstract class JavaCompilationArgsProvider implements TransitiveInfoProvi
    */
   public abstract NestedSet<Artifact> getCompileTimeJavaDependencyArtifacts();
 
-  /**
-   * Returns Java dependency artifacts for computing a restricted run-time
-   * classpath (called when strict_java_deps = 1).
-   */
-  public abstract NestedSet<Artifact> getRunTimeJavaDependencyArtifacts();
-
   public static JavaCompilationArgsProvider merge(
       Collection<JavaCompilationArgsProvider> providers) {
     if (providers.size() == 1) {
@@ -97,7 +86,6 @@ public abstract class JavaCompilationArgsProvider implements TransitiveInfoProvi
     JavaCompilationArgs.Builder javaCompilationArgs = JavaCompilationArgs.builder();
     JavaCompilationArgs.Builder recursiveJavaCompilationArgs = JavaCompilationArgs.builder();
     NestedSetBuilder<Artifact> compileTimeJavaDepArtifacts = NestedSetBuilder.stableOrder();
-    NestedSetBuilder<Artifact> runTimeJavaDepArtifacts = NestedSetBuilder.stableOrder();
 
     for (JavaCompilationArgsProvider provider : providers) {
       javaCompilationArgs.addTransitiveArgs(
@@ -105,13 +93,11 @@ public abstract class JavaCompilationArgsProvider implements TransitiveInfoProvi
       recursiveJavaCompilationArgs.addTransitiveArgs(
           provider.getRecursiveJavaCompilationArgs(), JavaCompilationArgs.ClasspathType.BOTH);
       compileTimeJavaDepArtifacts.addTransitive(provider.getCompileTimeJavaDependencyArtifacts());
-      runTimeJavaDepArtifacts.addTransitive(provider.getRunTimeJavaDependencyArtifacts());
     }
 
     return JavaCompilationArgsProvider.create(
         javaCompilationArgs.build(),
         recursiveJavaCompilationArgs.build(),
-        compileTimeJavaDepArtifacts.build(),
-        runTimeJavaDepArtifacts.build());
+        compileTimeJavaDepArtifacts.build());
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
index 75fd868db7..8eefc6fa86 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java
@@ -25,7 +25,6 @@ import com.google.devtools.build.lib.analysis.RunfilesProvider;
 import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 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.cpp.LinkerInput;
 import com.google.devtools.build.lib.rules.java.JavaCompilationArgs.ClasspathType;
 import com.google.devtools.build.lib.rules.java.proto.GeneratedExtensionRegistryProvider;
@@ -171,7 +170,6 @@ public class JavaLibrary implements RuleConfiguredTargetFactory {
         common.collectJavaCompilationArgs(true, neverLink, false);
     NestedSet<Artifact> compileTimeJavaDepArtifacts = common.collectCompileTimeDependencyArtifacts(
         javaArtifacts.getCompileTimeDependencyArtifact());
-    NestedSet<Artifact> runTimeJavaDepArtifacts = NestedSetBuilder.emptySet(Order.STABLE_ORDER);
     NestedSet<LinkerInput> transitiveJavaNativeLibraries =
         common.collectTransitiveJavaNativeLibraries();
 
@@ -195,8 +193,7 @@ public class JavaLibrary implements RuleConfiguredTargetFactory {
 
     JavaCompilationArgsProvider compilationArgsProvider =
         JavaCompilationArgsProvider.create(
-            javaCompilationArgs, recursiveJavaCompilationArgs,
-            compileTimeJavaDepArtifacts, runTimeJavaDepArtifacts);
+            javaCompilationArgs, recursiveJavaCompilationArgs, compileTimeJavaDepArtifacts);
     JavaSourceJarsProvider sourceJarsProvider = sourceJarsProviderBuilder.build();
     JavaRuleOutputJarsProvider ruleOutputJarsProvider = ruleOutputJarsProviderBuilder.build();
 
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 8baf2c41e5..93197acb9a 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
@@ -271,8 +271,7 @@ public final class JavaLibraryHelper {
     return JavaCompilationArgsProvider.create(
         isReportedAsStrict ? directArgs : transitiveArgs,
         transitiveArgs,
-        compileTimeJavaDepArtifacts,
-        NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER));
+        compileTimeJavaDepArtifacts);
   }
 
   private void addDepsToAttributes(JavaTargetAttributes.Builder attributes) {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java
index f8e5af668e..122eae4ee9 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSkylarkCommon.java
@@ -430,8 +430,7 @@ public class JavaSkylarkCommon {
     return JavaCompilationArgsProvider.create(
         directCompilationArgs.build(),
         provider.getRecursiveJavaCompilationArgs(),
-        provider.getCompileTimeJavaDependencyArtifacts(),
-        provider.getRunTimeJavaDependencyArtifacts());
+        provider.getCompileTimeJavaDependencyArtifacts());
   }
 
   @SkylarkCallable(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java
index b3a6947fa7..49cd3c8f98 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/ActionReuser.java
@@ -74,8 +74,7 @@ public class ActionReuser {
             JavaCompilationArgs.builder().merge(directJars).build(),
             transitiveJars.build(),
             NestedSetBuilder.create(
-                Order.STABLE_ORDER, directJars.getCompileTimeDependencyArtifact()),
-            NestedSetBuilder.emptySet(Order.STABLE_ORDER));
+                Order.STABLE_ORDER, directJars.getCompileTimeDependencyArtifact()));
 
     TransitiveInfoProviderMapBuilder javaProvidersBuilder =
         new TransitiveInfoProviderMapBuilder()
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/StrictDepsUtils.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/StrictDepsUtils.java
index c539c1209a..28f8219bea 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/StrictDepsUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/StrictDepsUtils.java
@@ -50,8 +50,7 @@ public class StrictDepsUtils {
       return JavaCompilationArgsProvider.create(
           nonStrictDirectJars.build(),
           strictCompProvider.getRecursiveJavaCompilationArgs(),
-          strictCompProvider.getCompileTimeJavaDependencyArtifacts(),
-          strictCompProvider.getRunTimeJavaDependencyArtifacts());
+          strictCompProvider.getCompileTimeJavaDependencyArtifacts());
     }
   }