commit a267501cab95ed0f468d039f575240481fdb7804
author cushon <cushon@google.com> Mon Feb 10 17:17:09 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Feb 10 17:18:06 2020 -0800
tree cabe6c5198e9c0144c329ae49faa2d0de5241a4c
parent d8cdb6d62485d88a0fbaac361def7aefeff7f4af

Fix handling of Error Prone plugins with --experimental_turbine_annotation_processing

PiperOrigin-RevId: 294340035

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

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 69051d0..8da333c 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
@@ -293,6 +293,14 @@
       builder.setSourceGenDirectory(sourceGenDir(outputs.output(), label));
       builder.setPlugins(plugins);
       builder.setManifestOutput(outputs.manifestProto());
+    } else {
+      // Don't do annotation processing, but pass the processorpath through to allow service-loading
+      // Error Prone plugins.
+      builder.setPlugins(
+          JavaPluginInfo.create(
+              /* processorClasses= */ NestedSetBuilder.emptySet(Order.STABLE_ORDER),
+              plugins.processorClasspath(),
+              plugins.data()));
     }
     builder.setOutputs(outputs);