diff options
| author |  jcater <jcater@google.com> | 2017-11-17 09:25:19 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-17 09:27:23 -0800 |
| commit | a90a976418e31922749d20e0caaa19cfe129ddbd (patch) | |
| tree | 4af2b017f1c93f37f1419a3a7159107c9cdf9ce9 /src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java | |
| parent | eba63896cc6f83608d59f044dd4d193ec72c03e6 (diff) | |
Convert JavaToolchainProvider to a concrete class, and a subclass of ToolchainInfo.
PiperOrigin-RevId: 176117866
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java index 0ba822fb4c..d0fd5b862b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationHelper.java @@ -719,7 +719,7 @@ public final class JavaCompilationHelper { private static ImmutableList<String> getDefaultJavacOptsFromRule(RuleContext ruleContext) { return ImmutableList.copyOf( Iterables.concat( - JavaToolchainProvider.fromRuleContext(ruleContext).getJavacOptions(), + JavaToolchainProvider.from(ruleContext).getJavacOptions(), ruleContext.getExpander().withDataLocations().tokenized("javacopts"))); } @@ -735,8 +735,7 @@ public final class JavaCompilationHelper { public static JavaToolchainProvider getJavaToolchainProvider( RuleContext ruleContext, String implicitAttributesSuffix) { - return ruleContext.getPrerequisite( - ":java_toolchain" + implicitAttributesSuffix, Mode.TARGET, JavaToolchainProvider.class); + return JavaToolchainProvider.from(ruleContext, ":java_toolchain" + implicitAttributesSuffix); } public static JavaToolchainProvider getJavaToolchainProvider(RuleContext ruleContext) { |