commit 3fb0f211deb47d04cc78a8070e97a62af5181504
author ilist <ilist@google.com> Tue Nov 17 10:37:15 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Nov 17 10:38:54 2020 -0800
tree 73121c6bed097dafbe673154db01451cb89c1290
parent 06a6d36202e2fe5b644d71c8022b8fb5c94a71c8

Replace "javac" attribute with "tools" attribute in java_toolchain.

This is preparation for removal of "javac" attribute.

The main usecase for "javac" attribute is to use it in $location function during JVM parameters expansion. And this works when javac is added to tools attribute.

There is a starlark API to retrieve javac from the java toolchain, but without a known usecase. That API is not used internally and it is not tested.

PiperOrigin-RevId: 342894757

tools/jdk/java_toolchain_default.bzl.java_tools

diff --git a/tools/jdk/java_toolchain_default.bzl.java_tools b/tools/jdk/java_toolchain_default.bzl.java_tools
index c6e6e1c..356c9fe 100644
--- a/tools/jdk/java_toolchain_default.bzl.java_tools
+++ b/tools/jdk/java_toolchain_default.bzl.java_tools
@@ -62,7 +62,7 @@
 )
 
 JVM8_TOOLCHAIN_CONFIGURATION = dict(
-    javac = ["//:javac_jar"],
+    tools = ["//:javac_jar"],
     jvm_opts = ["-Xbootclasspath/p:$(location //:javac_jar)"],
 )
 
@@ -127,7 +127,6 @@
 
 _LABEL_LISTS = [
     "bootclasspath",
-    "extclasspath",
     "javac",
     "tools",
     "javabuilder",