Java tools: flip incompatible flags for using remote java tools.
Fixes #7196 #7197
Closes #7423.
PiperOrigin-RevId: 234469160
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
index d4a72fd..70e0c06 100644
--- 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
@@ -586,7 +586,7 @@
@Option(
name = "incompatible_use_remote_java_toolchain",
- defaultValue = "false",
+ defaultValue = "true",
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
effectTags = {OptionEffectTag.UNKNOWN},
metadataTags = {
@@ -600,7 +600,7 @@
@Option(
name = "incompatible_use_remote_host_java_toolchain",
- defaultValue = "false",
+ defaultValue = "true",
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
effectTags = {OptionEffectTag.UNKNOWN},
metadataTags = {
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 99510e1..9b6a3f8 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -126,6 +126,19 @@
" genclass = ['GenClass_deploy.jar'],",
" ijar = ['ijar'],",
")",
+ "java_toolchain(",
+ " name = 'remote_toolchain',",
+ " source_version = '8',",
+ " target_version = '8',",
+ " bootclasspath = [':bootclasspath'],",
+ " extclasspath = [':extclasspath'],",
+ " javac = [':langtools'],",
+ " javabuilder = ['JavaBuilder_deploy.jar'],",
+ " header_compiler = ['turbine_deploy.jar'],",
+ " singlejar = ['SingleJar_deploy.jar'],",
+ " genclass = ['GenClass_deploy.jar'],",
+ " ijar = ['ijar'],",
+ ")",
"java_runtime(name = 'jdk', srcs = [])",
"java_runtime(name = 'host_jdk', srcs = [])",
"java_runtime(name = 'remote_jdk', srcs = [])",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
index f86d67a..185c58a 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java
@@ -1899,7 +1899,10 @@
configuredTarget.get(
new SkylarkKey(Label.parseAbsolute("//foo:rule.bzl", ImmutableMap.of()), "result"));
Label javaToolchainLabel = ((Label) info.getValue("java_toolchain_label"));
- assertThat(javaToolchainLabel.toString()).endsWith("jdk:toolchain");
+ assertThat(
+ javaToolchainLabel.toString().endsWith("jdk:remote_toolchain")
+ || javaToolchainLabel.toString().endsWith("jdk:toolchain"))
+ .isTrue();
}
@Test