Remove references to -XepOpt:Android:Java8Libs

PiperOrigin-RevId: 603126091

Author: cushon

core/src/main/java/com/google/errorprone/bugpatterns/apidiff/AndroidJdkLibsChecker.java

@@ -22,36 +22,31 @@
 
 import com.google.common.io.Resources;
 import com.google.errorprone.BugPattern;
-import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Matcher;
 import com.google.protobuf.ExtensionRegistry;
 import com.sun.source.tree.ExpressionTree;
 import java.io.IOException;
 import java.io.UncheckedIOException;
-import javax.inject.Inject;
 
 /**
  * Checks for uses of classes, fields, or methods that are not compatible with legacy Android
  * devices. As of Android N, that includes all of JDK8 (which is only supported on Nougat) except
  * type and repeated annotations, which are compiled in a backwards compatible way.
  */
 @BugPattern(
-    name = "AndroidJdkLibsChecker",
     altNames = "AndroidApiChecker",
     summary = "Use of class, field, or method that is not compatible with legacy Android devices",
     severity = ERROR)
 // TODO(b/32513850): Allow Android N+ APIs, e.g., by computing API diff using android.jar
 public class AndroidJdkLibsChecker extends ApiDiffChecker {
 
-  private static ApiDiff loadApiDiff(boolean allowJava8) {
+  private static ApiDiff loadApiDiff() {
     try {
       byte[] diffData =
           Resources.toByteArray(
-              Resources.getResource(
-                  AndroidJdkLibsChecker.class,
-                  allowJava8 ? "android_java8.binarypb" : "android.binarypb"));
+              Resources.getResource(AndroidJdkLibsChecker.class, "android_java8.binarypb"));
       ApiDiffProto.Diff diff =
           ApiDiffProto.Diff.newBuilder()
               .mergeFrom(diffData, ExtensionRegistry.getEmptyRegistry())
@@ -62,20 +57,8 @@ private static ApiDiff loadApiDiff(boolean allowJava8) {
     }
   }
 
-  private final boolean allowJava8;
-
-  @Inject
-  AndroidJdkLibsChecker(ErrorProneFlags flags) {
-    this(flags.getBoolean("Android:Java8Libs").orElse(false));
-  }
-
-  public AndroidJdkLibsChecker() {
-    this(false);
-  }
-
-  private AndroidJdkLibsChecker(boolean allowJava8) {
-    super(loadApiDiff(allowJava8));
-    this.allowJava8 = allowJava8;
+  private AndroidJdkLibsChecker() {
+    super(loadApiDiff());
   }
 
   private static final Matcher<ExpressionTree> FOREACH_ON_COLLECTION =
@@ -90,7 +73,7 @@ protected Description check(ExpressionTree tree, VisitorState state) {
     if (description.equals(NO_MATCH)) {
       return NO_MATCH;
     }
-    if (allowJava8 && FOREACH_ON_COLLECTION.matches(tree, state)) {
+    if (FOREACH_ON_COLLECTION.matches(tree, state)) {
       return NO_MATCH;
     }
     return description;

core/src/main/java/com/google/errorprone/bugpatterns/time/PreferJavaTimeOverload.java

@@ -35,7 +35,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.errorprone.BugPattern;
-import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker;
 import com.google.errorprone.bugpatterns.BugChecker.MethodInvocationTreeMatcher;
@@ -55,7 +54,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import javax.inject.Inject;
 
 /** This check suggests the use of {@code java.time}-based APIs, when available. */
 @BugPattern(
@@ -125,21 +123,10 @@ public final class PreferJavaTimeOverload extends BugChecker
           .onExactClass(JAVA_DURATION)
           .namedAnyOf("toNanos", "toMillis", "getSeconds", "toMinutes", "toHours", "toDays");
 
-  private final boolean hasJava8LibSupport;
-
-  @Inject
-  PreferJavaTimeOverload(ErrorProneFlags flags) {
-    this.hasJava8LibSupport = flags.getBoolean("Android:Java8Libs").orElse(false);
-  }
-
   // TODO(kak): Add support for constructors that accept a <long, TimeUnit> or JodaTime Duration
 
   @Override
   public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
-    // don't fire for Android code that doesn't have Java8 library support (b/138965731)
-    if (state.isAndroidCompatible() && !hasJava8LibSupport) {
-      return Description.NO_MATCH;
-    }
 
     // we return no match for a set of explicitly ignored APIs
     if (IGNORED_APIS.matches(tree, state)) {

core/src/test/java/com/google/errorprone/bugpatterns/apidiff/AndroidJdkLibsCheckerTest.java

@@ -16,7 +16,6 @@
 
 package com.google.errorprone.bugpatterns.apidiff;
 
-import com.google.common.collect.ImmutableList;
 import com.google.errorprone.CompilationTestHelper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,8 +26,7 @@
 public class AndroidJdkLibsCheckerTest extends Java7ApiCheckerTest {
 
   private final CompilationTestHelper allowJava8Helper =
-      CompilationTestHelper.newInstance(AndroidJdkLibsChecker.class, getClass())
-          .setArgs(ImmutableList.of("-XepOpt:Android:Java8Libs"));
+      CompilationTestHelper.newInstance(AndroidJdkLibsChecker.class, getClass());
 
   public AndroidJdkLibsCheckerTest() {
     super(AndroidJdkLibsChecker.class);