In JavaHeaderCompileAction, pass -Aexperimental_turbine_hjar to all header compilation actions

This is currently being used by Dagger to optimize generated code for header compilation, this change is being done in preparation for similar optimizations in other annotation processors.

PiperOrigin-RevId: 837823870
Change-Id: I4572af044da9e5eef1351c062bb8bd4aabdd78f9

Author: cushon

src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java

@@ -446,13 +446,6 @@ public void createHeaderCompilationAction(
     builder.setHeaderCompilationOutputJar(headerCompilationOutputJar);
     builder.setOutputDepsProto(headerDeps);
     builder.setPlugins(plugins);
-    if (plugins
-        .processorClasses()
-        .toList()
-        .contains("dagger.internal.codegen.ComponentProcessor")) {
-      // See b/31371210 and b/142059842.
-      builder.addTurbineHjarJavacOpt();
-    }
     builder.enableDirectClasspath(enableDirectClasspath);
     builder.build(javaToolchain);
   }

src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java

@@ -199,7 +199,6 @@ public static final class Builder {
     private NestedSet<Artifact> compileTimeDependencyArtifacts =
         NestedSetBuilder.emptySet(Order.STABLE_ORDER);
     private ImmutableList<String> javacOpts = ImmutableList.of();
-    private boolean addTurbineHjarJavacOpt = false;
     private JavaPluginData plugins = JavaPluginData.empty();
 
     private ImmutableList<Artifact> additionalInputs = ImmutableList.of();
@@ -272,16 +271,6 @@ public Builder setJavacOpts(ImmutableList<String> javacOpts) {
       return this;
     }
 
-    /**
-     * Adds {@code -Aexperimental_turbine_hjar} to Java compiler flags without creating an entirely
-     * new list.
-     */
-    @CanIgnoreReturnValue
-    public Builder addTurbineHjarJavacOpt() {
-      this.addTurbineHjarJavacOpt = true;
-      return this;
-    }
-
     /** Sets the output jar. */
     @CanIgnoreReturnValue
     public Builder setOutputJar(Artifact outputJar) {
@@ -505,17 +494,14 @@ public void build(JavaToolchainProvider javaToolchain)
               .addExecPaths("--source_jars", sourceJars)
               .add("--injecting_rule_kind", injectingRuleKind);
 
-      if (!javacOpts.isEmpty() || addTurbineHjarJavacOpt) {
-        commandLine.add("--javacopts");
-        if (!javacOpts.isEmpty()) {
-          commandLine.addObject(javacOpts);
-        }
-        if (addTurbineHjarJavacOpt) {
-          commandLine.add("-Aexperimental_turbine_hjar");
-        }
-        // terminate --javacopts with `--` to support javac flags that start with `--`
-        commandLine.add("--");
+      commandLine.add("--javacopts");
+      if (!javacOpts.isEmpty()) {
+        commandLine.addObject(javacOpts);
       }
+      // See b/31371210, b/142059842, and b/464431616.
+      commandLine.add("-Aexperimental_turbine_hjar");
+      // terminate --javacopts with `--` to support javac flags that start with `--`
+      commandLine.add("--");
 
       if (targetLabel != null) {
         commandLine.add("--target_label");