diff options
Diffstat (limited to 'src/main/java/com/google')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaSemantics.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 a105d72068..8090466dcc 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 @@ -106,7 +106,7 @@ public interface JavaSemantics { /** * Label to the Java Toolchain rule. It is resolved from a label given in the java options. */ - String JAVA_TOOLCHAIN_LABEL = "//tools/defaults:java_toolchain"; + String JAVA_TOOLCHAIN_LABEL = "//tools/jdk:toolchain"; /** The java_toolchain.compatible_javacopts key for Java 7 javacopts */ public static final String JAVA7_JAVACOPTS_KEY = "java7"; @@ -121,9 +121,7 @@ public interface JavaSemantics { RuleDefinitionEnvironment environment) { return LabelLateBoundDefault.fromTargetConfiguration( JavaConfiguration.class, - // TODO(b/79239052): replace by //environment.getToolsLabel(JAVA_TOOLCHAIN_LABEL) - // @bazel_tools//tools/defaults can not be resolved while DefaultPackage exists. - Label.parseAbsoluteUnchecked(JAVA_TOOLCHAIN_LABEL), + environment.getToolsLabel(JAVA_TOOLCHAIN_LABEL), (Attribute.LateBoundDefault.Resolver<JavaConfiguration, Label> & Serializable) (rule, attributes, javaConfig) -> javaConfig.getToolchainLabel()); } |