diff options
Diffstat (limited to 'src/main')
3 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImplicitAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImplicitAttributes.java index 758c88b698..4d12fe910f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImplicitAttributes.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImplicitAttributes.java @@ -19,8 +19,12 @@ package com.google.devtools.build.lib.rules.java; */ public class JavaImplicitAttributes { /** - * Label of a pseudo-filegroup that contains all jdk files for all configurations, as specified on - * the command-line. + * Label of the default target JDK. */ public static final String JDK_LABEL = "//tools/jdk:jdk"; + + /** + * Label of the default host JDK. + */ + public static final String HOST_JDK_LABEL = "//tools/jdk:host_jdk"; } 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 fc5bca7fad..6155d68e0d 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 @@ -104,7 +104,7 @@ public class JavaOptions extends FragmentOptions { @Option( name = "host_javabase", - defaultValue = "@bazel_tools//tools/jdk:jdk", + defaultValue = "@bazel_tools//tools/jdk:host_jdk", converter = LabelConverter.class, category = "version", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java index 76e0376a8a..f1be429fc0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java @@ -148,7 +148,7 @@ public interface JavaSemantics { static LateBoundDefault<?, Label> hostJdkAttribute(RuleDefinitionEnvironment env) { return LateBoundDefault.fromHostConfiguration( Jvm.class, - env.getToolsLabel(JavaImplicitAttributes.JDK_LABEL), + env.getToolsLabel(JavaImplicitAttributes.HOST_JDK_LABEL), (rule, attributes, jvm) -> jvm.getJvmLabel()); } |