Prepare to remove --experimental_optimize_header_compilation_annotation_processing

--
MOS_MIGRATED_REVID=137035372

3 files changed, 8 insertions, 16 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 6b3731d33d..fec64a367a 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
@@ -273,13 +273,11 @@ public final class JavaCompilationHelper extends BaseJavaCompilationHelper {
     builder.setClasspathEntries(attributes.getCompileTimeClassPath());
     builder.addAllBootclasspathEntries(getBootclasspathOrDefault());
     builder.addAllExtClasspathEntries(getExtdirInputs());
-    if (getJavaConfiguration().optimizeHeaderCompilationAnnotationProcessing()) {
-      builder.addProcessorPaths(attributes.getApiGeneratingProcessorPath());
-      builder.addProcessorNames(attributes.getApiGeneratingProcessorNames());
-    } else {
-      builder.addProcessorPaths(attributes.getProcessorPath());
-      builder.addProcessorNames(attributes.getProcessorNames());
-    }
+
+    // only run API-generating annotation processors during header compilation
+    builder.addProcessorPaths(attributes.getApiGeneratingProcessorPath());
+    builder.addProcessorNames(attributes.getApiGeneratingProcessorNames());
+
     builder.setJavacOpts(getJavacOpts());
     builder.setTempDirectory(tempDir(headerJar));
     builder.setOutputJar(headerJar);
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
index b52ac02471..df7ea2e6e4 100644
--- 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
@@ -127,7 +127,6 @@ public final class JavaConfiguration extends Fragment {
   private final Label javaLauncherLabel;
   private final boolean useIjars;
   private final boolean useHeaderCompilation;
-  private final boolean optimizeHeaderCompilationAnnotationProcessing;
   private final boolean generateJavaDeps;
   private final boolean strictDepsJavaProtos;
   private final JavaClasspathMode javaClasspath;
@@ -157,8 +156,6 @@ public final class JavaConfiguration extends Fragment {
     this.javaLauncherLabel = javaOptions.javaLauncher;
     this.useIjars = javaOptions.useIjars;
     this.useHeaderCompilation = javaOptions.headerCompilation;
-    this.optimizeHeaderCompilationAnnotationProcessing =
-        javaOptions.optimizeHeaderCompilationAnnotationProcessing;
     this.generateJavaDeps = generateJavaDeps;
     this.javaClasspath = javaOptions.javaClasspath;
     this.javaWarns = ImmutableList.copyOf(javaOptions.javaWarns);
@@ -220,11 +217,6 @@ public final class JavaConfiguration extends Fragment {
     return useHeaderCompilation;
   }
 
-  /** Returns true if only api-generating java_plugins should be run during header compilation. */
-  public boolean optimizeHeaderCompilationAnnotationProcessing() {
-    return optimizeHeaderCompilationAnnotationProcessing;
-  }
-
   /**
    * Returns true iff dependency information is generated after compilation.
    */
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
index 212784b532..51bc08eddf 100644
--- 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
@@ -172,11 +172,13 @@ public class JavaOptions extends FragmentOptions {
   )
   public boolean headerCompilation;
 
+  // TODO(cushon): delete flag after removing from global .blazerc
+  @Deprecated
   @Option(
     name = "experimental_optimize_header_compilation_annotation_processing",
     defaultValue = "false",
     category = "undocumented",
-    help = "Experimental: only run api-generating java_plugins during header compilation."
+    help = "This flag is a noop and scheduled for removal."
   )
   public boolean optimizeHeaderCompilationAnnotationProcessing;