From eefcdbf2dc39c94dc0a73e9c5aa0f718ad6cf51a Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Wed, 25 Nov 2020 11:19:53 +0000
Subject: [PATCH] Move java_tools javac argument into tools parameter.

Bazel@HEAD has javac parameter removed. The javac package can be listed next to other tools.

Change-Id: I15aaad773d81d8ccfc4374252abfc5da0420e46f
(cherry picked from commit b4d318e27536da0c8c4c17a69592923bc6427054)
---
 tools/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/BUILD b/tools/BUILD
index be12735c7c..545a20607b 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -44,7 +44,6 @@ default_java_toolchain(
     header_compiler_direct = ["@bazel_tools//tools/jdk:turbine_direct"],
     ijar = ["@bazel_tools//tools/jdk:ijar"],
     javabuilder = ["@bazel_tools//tools/jdk:javabuilder"],
-    javac = ["@bazel_tools//tools/jdk:javac_jar"],
     javac_supports_workers = True,
     jvm_opts = JDK11_JVM_OPTS,
     misc = [
@@ -60,6 +59,7 @@ default_java_toolchain(
     target_version = "11",
     tools = [
         "@bazel_tools//tools/jdk:java_compiler_jar",
+        "@bazel_tools//tools/jdk:javac_jar",
         "@bazel_tools//tools/jdk:jdk_compiler_jar",
     ],
     visibility = ["//visibility:public"],