Include extclasspath entries in the bootclasspath
PiperOrigin-RevId: 294469405
diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
index d1f14d6..b095f7e 100644
--- a/src/java_tools/buildjar/BUILD
+++ b/src/java_tools/buildjar/BUILD
@@ -57,12 +57,7 @@
# This toolchain is used to bootstrap Bazel.
java_toolchain(
name = "bootstrap_toolchain",
- # javac -extdirs is implemented by appending the contents to the platform
- # class path after -bootclasspath. For convenience, we currently have a
- # single jar that contains the contents of both the bootclasspath and
- # extdirs.
bootclasspath = ["//tools/jdk:platformclasspath.jar"],
- extclasspath = [],
genclass = ["bootstrap_genclass_deploy.jar"],
ijar = ["//third_party/ijar"],
javabuilder = ["bootstrap_VanillaJavaBuilder_deploy.jar"],
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaCompileActionTestHelper.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaCompileActionTestHelper.java
index 05e7de8..ae5e916 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaCompileActionTestHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaCompileActionTestHelper.java
@@ -86,10 +86,6 @@
return getOptions(javac).getBootClassPath();
}
- public static List<String> getExtdir(JavaCompileAction javac) throws Exception {
- return getOptions(javac).getExtClassPath();
- }
-
/** Returns the JavaBuilder command line, up to the main class or deploy jar. */
public static List<String> getJavacCommand(JavaCompileAction action) throws Exception {
List<String> args = action.getCommandLines().allArguments();
