Remove --incompatible_use_remotejdk_as_host_javabase flag.

Now we always use the remote JDK if host javabase is not explicitly set (and if we need a JDK at all). Progress on #6656 and #6592 and #6313. RELNOTES: None PiperOrigin-RevId: 223524214
bazelbuild · Nov 30, 2018 · f195d55 · f195d55
1 parent c3e2de3
commit f195d55
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 35 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -112,19 +112,6 @@ public ImportDepsCheckingLevelConverter() {
               + "tools during a build.")
   public Label hostJavaBase;
 
-  @Option(
-      name = "incompatible_use_remotejdk_as_host_javabase",
-      defaultValue = "false",
-      documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-      effectTags = {OptionEffectTag.UNKNOWN},
-      metadataTags = {
-        OptionMetadataTag.INCOMPATIBLE_CHANGE,
-        OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
-      },
-      help =
-          "If enabled, uses a JDK downloaded from a remote repository instead of the embedded JDK.")
-  public boolean useRemoteJdkAsHostJavaBase;
-
   @Option(
       name = "incompatible_use_jdk10_as_host_javabase",
       defaultValue = "false",
@@ -592,10 +579,8 @@ private Label getHostJavaBase() {
     if (hostJavaBase == null) {
       if (useJDK10AsHostJavaBase) {
         return Label.parseAbsoluteUnchecked("@bazel_tools//tools/jdk:remote_jdk10");
-      } else if (useRemoteJdkAsHostJavaBase) {
-        return Label.parseAbsoluteUnchecked("@bazel_tools//tools/jdk:remote_jdk");
       } else {
-        return Label.parseAbsoluteUnchecked("@bazel_tools//tools/jdk:host_jdk");
+        return Label.parseAbsoluteUnchecked("@bazel_tools//tools/jdk:remote_jdk");
       }
     }
     return hostJavaBase;

diff --git a/src/test/shell/bazel/bazel_enable_disable_tools_defaults_flag_test.sh b/src/test/shell/bazel/bazel_enable_disable_tools_defaults_flag_test.sh
@@ -55,7 +55,7 @@ EOF
   expect_query_targets //tools/defaults:jdk //a:a
 
   bazel query 'deps(//tools/defaults:jdk, 1)' >& "$TEST_log" --incompatible_disable_tools_defaults_package=false || fail "Query failed"
-  expect_query_targets //tools/defaults:jdk @bazel_tools//tools/jdk:{jdk,host_jdk}
+  expect_query_targets //tools/defaults:jdk @bazel_tools//tools/jdk:{jdk,remote_jdk}
 
   rm tools/defaults/BUILD
   rm a/BUILD
@@ -77,7 +77,7 @@ filegroup(
 )
 EOF
   bazel query 'deps(//tools/defaults:jdk, 1)' >& "$TEST_log" --incompatible_disable_tools_defaults_package=false || fail "Query failed"
-  expect_query_targets //tools/defaults:jdk @bazel_tools//tools/jdk:{jdk,host_jdk}
+  expect_query_targets //tools/defaults:jdk @bazel_tools//tools/jdk:{jdk,remote_jdk}
 
 
   bazel query 'deps(//tools/defaults:jdk, 1)' >& "$TEST_log" --incompatible_disable_tools_defaults_package=true || fail "Query failed"

diff --git a/src/test/shell/integration/bazel_java_test.sh b/src/test/shell/integration/bazel_java_test.sh
@@ -71,14 +71,11 @@ EOF
   # If we don't specify anything, we expect the embedded JDK to be used.
   # Note that this will change in the future but is the current state.
   bazel aquery --output=text //java:javalib >& $TEST_log
-  expect_log "exec external/embedded_jdk/bin/java"
-
-  bazel aquery --output=text --incompatible_use_remotejdk_as_host_javabase \
-    //java:javalib >& $TEST_log
+  expect_not_log "exec external/embedded_jdk/bin/java"
   expect_log "exec external/remotejdk_.*/bin/java"
 
   bazel aquery --output=text --host_javabase=//:host_javabase \
-    --incompatible_use_remotejdk_as_host_javabase //java:javalib >& $TEST_log
+    //java:javalib >& $TEST_log
   expect_log "exec .*foobar/bin/java"
   expect_not_log "exec external/remotejdk_.*/bin/java"
 
@@ -217,8 +214,8 @@ EOF
     'deps(//:with_java)' >& $TEST_log
   expect_not_log "foo"
   expect_log "bar"
-  expect_log "embedded_jdk"
-  expect_not_log "remotejdk_"
+  expect_not_log "embedded_jdk"
+  expect_log "remotejdk_"
   expect_not_log "remotejdk10_"
 
   bazel cquery --max_config_changes_to_show=0 --implicit_deps \
@@ -229,18 +226,9 @@ EOF
   expect_not_log "remotejdk_"
   expect_not_log "remotejdk10_"
 
-  bazel cquery --max_config_changes_to_show=0 --implicit_deps \
-    'deps(//:with_java)' --incompatible_use_remotejdk_as_host_javabase \
-    >& $TEST_log
-  expect_not_log "foo"
-  expect_log "bar"
-  expect_not_log "embedded_jdk"
-  expect_log "remotejdk_"
-  expect_not_log "remotejdk10_"
-
   bazel cquery --max_config_changes_to_show=0 --implicit_deps \
     'deps(//:with_java)' --host_javabase=:foo_javabase \
-    --incompatible_use_remotejdk_as_host_javabase >& $TEST_log
+    >& $TEST_log
   expect_log "foo"
   expect_log "bar"
   expect_not_log "embedded_jdk"