Delete obsolete API in ErrorProneAnalyzer

--
MOS_MIGRATED_REVID=137464177

1 files changed, 2 insertions, 14 deletions

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java
index 63be47d1ab..0c7b9ec197 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/errorprone/ErrorPronePlugin.java
@@ -20,7 +20,6 @@ import com.google.devtools.build.buildjar.javac.plugins.BlazeJavaCompilerPlugin;
 import com.google.errorprone.ErrorProneAnalyzer;
 import com.google.errorprone.ErrorProneError;
 import com.google.errorprone.ErrorProneOptions;
-import com.google.errorprone.ErrorPronePlugins;
 import com.google.errorprone.InvalidCommandLineOptionException;
 import com.google.errorprone.scanner.BuiltInCheckerSuppliers;
 import com.google.errorprone.scanner.ScannerSupplier;
@@ -29,7 +28,6 @@ import com.sun.source.util.TaskEvent.Kind;
 import com.sun.tools.javac.comp.AttrContext;
 import com.sun.tools.javac.comp.Env;
 import com.sun.tools.javac.main.JavaCompiler;
-import com.sun.tools.javac.main.Main.Result;
 import com.sun.tools.javac.util.Context;
 import com.sun.tools.javac.util.JavacMessages;
 import com.sun.tools.javac.util.Log;
@@ -90,20 +88,10 @@ public final class ErrorPronePlugin extends BlazeJavaCompilerPlugin {
 
     setupMessageBundle(context);
 
-    // load Error Prone plugins from the annotation processor classpath
-    ScannerSupplier result = ErrorPronePlugins.loadPlugins(scannerSupplier, context);
-
-    if (epOptions != null) {
-      try {
-        result = result.applyOverrides(epOptions);
-      } catch (InvalidCommandLineOptionException e) {
-        throwError(Result.CMDERR, e.getMessage());
-      }
-    } else {
+    if (epOptions == null) {
       epOptions = ErrorProneOptions.empty();
     }
-
-    errorProneAnalyzer = ErrorProneAnalyzer.create(result.get()).init(context, epOptions);
+    errorProneAnalyzer = new ErrorProneAnalyzer(scannerSupplier, epOptions, context);
   }
 
   /** Run Error Prone analysis after performing dataflow checks. */