From 10ffddb13ac070f2c6b9d64cb927ab3b659c0b72 Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Fri, 9 Oct 2020 09:55:06 -0700
Subject: [PATCH] Use the non-javac-based turbine everywhere

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

diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index cf4a2fff0bcdc5..6efd69d471ff70 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -51,7 +51,7 @@ DEFAULT_JAVACOPTS = [
 DEFAULT_TOOLCHAIN_CONFIGURATION = {
     "forcibly_disable_header_compilation": 0,
     "genclass": ["@bazel_tools//tools/jdk:genclass"],
-    "header_compiler": ["@bazel_tools//tools/jdk:turbine"],
+    "header_compiler": ["@bazel_tools//tools/jdk:turbine_direct"],
     "header_compiler_direct": ["@bazel_tools//tools/jdk:turbine_direct"],
     "ijar": ["@bazel_tools//tools/jdk:ijar"],
     "javabuilder": ["@bazel_tools//tools/jdk:javabuilder"],
diff --git a/tools/jdk/java_toolchain_default.bzl b/tools/jdk/java_toolchain_default.bzl
index 3187356c8dfb26..7a934d2f4abced 100644
--- a/tools/jdk/java_toolchain_default.bzl
+++ b/tools/jdk/java_toolchain_default.bzl
@@ -44,7 +44,7 @@ JDK9_JVM_OPTS = [
 _BASE_TOOLCHAIN_CONFIGURATION = dict(
     forcibly_disable_header_compilation = False,
     genclass = [":GenClass"],
-    header_compiler = [":Turbine"],
+    header_compiler = [":TurbineDirect"],
     header_compiler_direct = [":TurbineDirect"],
     ijar = [":ijar"],
     javabuilder = [":JavaBuilder"],