commit 7ecdc85014493c8a9ee3da9a70f66b3cb2ee2844
author cushon <cushon@google.com> Thu Oct 08 17:58:29 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 08 17:59:47 2020 -0700
tree c846ee27c32366dcd18a58be9315563633e99e88
parent a1d002c8da8ff304f28617f5f73353ff6e3a64df

Remove testonly logic for configuring annotation processors

PiperOrigin-RevId: 336202275

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
index d6c4c6f..327fc59 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/JavaLibraryBuildRequest.java
@@ -340,7 +340,6 @@
             .bootClassPath(getBootClassPath())
             .system(getSystem())
             .sourceFiles(ImmutableList.copyOf(getSourceFiles()))
-            .processors(null)
             .builtinProcessors(builtinProcessorNames)
             .sourcePath(getSourcePath())
             .sourceOutput(getSourceGenDir())

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacArguments.java

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacArguments.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacArguments.java
index b983ec9..5c1bb8b 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacArguments.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacArguments.java
@@ -20,7 +20,6 @@
 import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin;
 import java.nio.file.Path;
 import javax.annotation.Nullable;
-import javax.annotation.processing.Processor;
 
 /**
  * Arguments to a single compilation performed by {@link BlazeJavacMain}.
@@ -60,13 +59,6 @@
   /** The compiler plugins. */
   public abstract ImmutableList<BlazeJavaCompilerPlugin> plugins();
 
-  /**
-   * Annotation processor classes. In production builds, processors are specified by string class
-   * name in {@link #javacOptions}; this is used for tests that instantate processors directly.
-   */
-  @Nullable
-  public abstract ImmutableList<Processor> processors();
-
   /** The class output directory (-d). */
   public abstract Path classOutput();
 
@@ -89,7 +81,6 @@
         .blazeJavacOptions(ImmutableList.of())
         .sourceFiles(ImmutableList.of())
         .sourcePath(ImmutableList.of())
-        .processors(null)
         .sourceOutput(null)
         .builtinProcessors(ImmutableSet.of())
         .processorPath(ImmutableList.of())
@@ -118,8 +109,6 @@
 
     Builder sourceFiles(ImmutableList<Path> sourceFiles);
 
-    Builder processors(ImmutableList<Processor> processors);
-
     Builder builtinProcessors(ImmutableSet<String> builtinProcessors);
 
     Builder sourceOutput(Path sourceOutput);

src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
index e470ea0..f80b6b8 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/BlazeJavacMain.java
@@ -108,9 +108,6 @@
                   /* classes= */ ImmutableList.of(),
                   fileManager.getJavaFileObjectsFromPaths(arguments.sourceFiles()),
                   context);
-      if (arguments.processors() != null) {
-        task.setProcessors(arguments.processors());
-      }
       fileManager.setContext(context);
       setLocations(fileManager, arguments);
       try {