From 805cad3782b83bb8e368f0f6e13ff9c7d347e728 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Mon, 23 Dec 2024 09:42:23 -0800
Subject: [PATCH] bazel: Restore DoNotCall ErrorProne check

In e08b9db20 we added `@DoNotCall` annotations to some call sites, but
Bazel used an older version of ErrorProne that complained at times it
shouldn't. The minimum version of Bazel we test/support is now Bazel 6,
well past Bazel 3.4+.
---
 api/BUILD.bazel  | 1 -
 core/BUILD.bazel | 1 -
 2 files changed, 2 deletions(-)

diff --git a/api/BUILD.bazel b/api/BUILD.bazel
index 6bf3375e9f..965d14a9eb 100644
--- a/api/BUILD.bazel
+++ b/api/BUILD.bazel
@@ -6,7 +6,6 @@ java_library(
         "src/main/java/**/*.java",
         "src/context/java/**/*.java",
     ]),
-    javacopts = ["-Xep:DoNotCall:OFF"],  # Remove once requiring Bazel 3.4.0+; allows non-final
     visibility = ["//visibility:public"],
     deps = [
         artifact("com.google.code.findbugs:jsr305"),
diff --git a/core/BUILD.bazel b/core/BUILD.bazel
index 35c20628d0..6dd5199b5c 100644
--- a/core/BUILD.bazel
+++ b/core/BUILD.bazel
@@ -17,7 +17,6 @@ java_library(
     srcs = glob([
         "src/main/java/io/grpc/internal/*.java",
     ]),
-    javacopts = ["-Xep:DoNotCall:OFF"],  # Remove once requiring Bazel 3.4.0+; allows non-final
     resources = glob([
         "src/bazel-internal/resources/**",
     ]),