From 8cec289ace6de2d54dfd78100ee2012d6028d8b1 Mon Sep 17 00:00:00 2001
From: ilist <ilist@google.com>
Date: Fri, 23 Oct 2020 01:59:15 -0700
Subject: [PATCH] Add `-XDcompilePolicy=simple` to default javacopts

it is required by Error Prone, see linked bug.

Fixes https://github.com/bazelbuild/bazel/issues/12270

PiperOrigin-RevId: 338634333
---
 tools/jdk/default_java_toolchain.bzl | 1 +
 tools/jdk/java_toolchain_default.bzl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index 6efd69d471ff70..a3078081e1eb21 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -44,6 +44,7 @@ JDK9_JVM_OPTS = [
 
 DEFAULT_JAVACOPTS = [
     "-XDskipDuplicateBridges=true",
+    "-XDcompilePolicy=simple",
     "-g",
     "-parameters",
 ]
diff --git a/tools/jdk/java_toolchain_default.bzl b/tools/jdk/java_toolchain_default.bzl
index 72a722e4bd5718..88e0d574b98480 100644
--- a/tools/jdk/java_toolchain_default.bzl
+++ b/tools/jdk/java_toolchain_default.bzl
@@ -16,6 +16,7 @@
 
 _DEFAULT_JAVACOPTS = [
     "-XDskipDuplicateBridges=true",
+    "-XDcompilePolicy=simple",
     "-g",
     "-parameters",
 ]