Add --experimental_javac_exclude_transitive_workspace_jars

rsalvador · Jan 1, 2023 · 4c7ea46 · 4c7ea46
1 parent 5f29bb3
commit 4c7ea46
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileActionBuilder.java
@@ -244,9 +244,9 @@ public JavaCompileAction build() {
       classpathMode = JavaClasspathMode.OFF;
     }
 
+    JavaConfiguration javaConfiguration =
+        ruleContext.getConfiguration().getFragment(JavaConfiguration.class);
     if (outputs.depsProto() != null) {
-      JavaConfiguration javaConfiguration =
-          ruleContext.getConfiguration().getFragment(JavaConfiguration.class);
       if (javaConfiguration.inmemoryJdepsFiles()) {
         executionInfo =
             ImmutableMap.<String, String>builderWithExpectedSize(this.executionInfo.size() + 1)
@@ -271,6 +271,19 @@ public JavaCompileAction build() {
       executableLine.stripOutputPaths(JavaCompilationHelper.outputBase(outputs.output()));
     }
 
+    NestedSet<Artifact> transitiveInputs = classpathEntries;
+    if (javaConfiguration.javacExcludeTransitiveWorkspaceJars() && isWorkspaceJar(outputs.output())) {
+      NestedSetBuilder<Artifact> inputsBuilder = NestedSetBuilder.compileOrder();
+      ImmutableSet<Artifact> directJarsSet = directJars.toSet();
+      for (Artifact artifact: classpathEntries.toList()) {
+        // skip adding transitive workspace jars
+        if (!isWorkspaceJar(artifact) || directJarsSet.contains(artifact)) {
+          inputsBuilder.add(artifact);
+        }
+      }
+      transitiveInputs = inputsBuilder.build();
+    }
+
     return new JavaCompileAction(
         /* compilationType= */ JavaCompileAction.CompilationType.JAVAC,
         /* owner= */ ruleContext.getActionOwner(),
@@ -284,7 +297,7 @@ public JavaCompileAction build() {
             /* sourceJars= */ sourceJars,
             /* plugins= */ plugins),
         /* mandatoryInputs= */ mandatoryInputs,
-        /* transitiveInputs= */ classpathEntries, // directJars,
+        /* transitiveInputs= */ transitiveInputs,
         /* directJars= */ directJars,
         /* outputs= */ allOutputs(),
         /* executionInfo= */ executionInfo,
@@ -297,6 +310,15 @@ public JavaCompileAction build() {
         /* classpathMode= */ classpathMode);
   }
 
+  /**
+   * @return True iff artifact is a jar build by the root workspace
+   */
+  private static boolean isWorkspaceJar(Artifact artifact) {
+    String execPath = artifact.getExecPathString();
+    // TODO: better implementation/criteria
+    return !(artifact.getRoot().isExternal() || execPath.contains("/bin/external/") || execPath.contains("/third_party/"));
+  }
+
   private ImmutableSet<Artifact> allOutputs() {
     ImmutableSet.Builder<Artifact> result =
         ImmutableSet.<Artifact>builder()

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
@@ -89,6 +89,7 @@ public enum ImportDepsCheckingLevel {
   private final boolean allowRuntimeDepsOnNeverLink;
   private final JavaClasspathMode javaClasspath;
   private final boolean inmemoryJdepsFiles;
+  private final boolean javacExcludeTransitiveWorkspaceJars;
   private final ImmutableList<String> defaultJvmFlags;
   private final StrictDepsMode strictJavaDeps;
   private final String fixDepsTool;
@@ -127,6 +128,7 @@ public JavaConfiguration(BuildOptions buildOptions) throws InvalidConfigurationE
         javaOptions.javaDeps || javaOptions.javaClasspath != JavaClasspathMode.OFF;
     this.javaClasspath = javaOptions.javaClasspath;
     this.inmemoryJdepsFiles = javaOptions.inmemoryJdepsFiles;
+    this.javacExcludeTransitiveWorkspaceJars = javaOptions.javacExcludeTransitiveWorkspaceJars;
     this.defaultJvmFlags = ImmutableList.copyOf(javaOptions.jvmOpts);
     this.strictJavaDeps = javaOptions.strictJavaDeps;
     this.fixDepsTool = javaOptions.fixDepsTool;
@@ -263,6 +265,8 @@ public boolean inmemoryJdepsFiles() {
     return inmemoryJdepsFiles;
   }
 
+  public boolean javacExcludeTransitiveWorkspaceJars() { return javacExcludeTransitiveWorkspaceJars; }
+
   @Override
   public ImmutableList<String> getDefaultJvmFlags() {
     return defaultJvmFlags;

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -209,6 +209,14 @@ public ImportDepsCheckingLevelConverter() {
               + "written to disk.")
   public boolean inmemoryJdepsFiles;
 
+  @Option(
+      name = "experimental_javac_exclude_transitive_workspace_jars",
+      defaultValue = "false",
+      documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+      effectTags = {OptionEffectTag.UNKNOWN},
+      help = "Help: do not pass transitive workspace jars to the java compile action")
+  public boolean javacExcludeTransitiveWorkspaceJars;
+
   @Option(
       name = "java_debug",
       defaultValue = "null",