Remove hard-coded -Xbootclasspath/p flags for javac and turbine invocations

And instead rely on the flags being set in java_toolchain.jvm_opts.
This change is being made in preparation for JDK 9, which replaces
-Xbootclasspath/p with --patch-module.

PiperOrigin-RevId: 161620182

2 files changed, 6 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
index 89179476ca..b45cb28a0e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java
@@ -425,19 +425,13 @@ public final class JavaCompileAction extends SpawnAction {
         checkNotNull(langtoolsJar);
         checkNotNull(javaBuilderJar);
 
-        CustomCommandLine.Builder builder =  CustomCommandLine.builder()
-            .addPath(javaExecutable)
-            // Langtools jar is placed on the boot classpath so that it can override classes
-            // in the JRE. Typically this has no effect since langtools.jar does not have
-            // classes in common with rt.jar. However, it is necessary when using a version
-            // of javac.jar generated via ant from the langtools build.xml that is of a
-            // different version than AND has an overlap in contents with the default
-            // run-time (eg while upgrading the Java version).
-            .addPaths("-Xbootclasspath/p:%s", langtoolsJar.getExecPath())
-            .add(javaBuilderJvmFlags);
+        CustomCommandLine.Builder builder =
+            CustomCommandLine.builder().addPath(javaExecutable).add(javaBuilderJvmFlags);
         if (!instrumentationJars.isEmpty()) {
           builder
-              .addJoinExecPaths("-cp", pathDelimiter,
+              .addJoinExecPaths(
+                  "-cp",
+                  pathDelimiter,
                   Iterables.concat(instrumentationJars, ImmutableList.of(javaBuilderJar)))
               .add(javaBuilderMainClass);
         } else {
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
index cea07c0d3a..1bd31013bc 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java
@@ -388,10 +388,7 @@ public class JavaHeaderCompileAction extends SpawnAction {
             .setJarExecutable(
                 JavaCommon.getHostJavaExecutable(ruleContext),
                 javaToolchain.getHeaderCompiler(),
-                ImmutableList.<String>builder()
-                    .add("-Xbootclasspath/p:" + javacJar.getExecPath())
-                    .addAll(javaToolchain.getJvmOptions())
-                    .build())
+                javaToolchain.getJvmOptions())
             .setMnemonic("Turbine")
             .setProgressMessage(getProgressMessage())
             .build(ruleContext);
@@ -488,7 +485,6 @@ public class JavaHeaderCompileAction extends SpawnAction {
           .addPath(JavaCommon.getHostJavaExecutable(ruleContext))
           .add("-Xverify:none")
           .add(javaToolchain.getJvmOptions())
-          .addPaths("-Xbootclasspath/p:%s", javacJar.getExecPath())
           .addExecPath("-jar", javaToolchain.getHeaderCompiler());
     }