diff options
| author |  John Cater <jcater@google.com> | 2018-01-23 05:35:36 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-23 05:37:20 -0800 |
| commit | b4cf329022bb4afd45e96c2990dd869c200dc739 (patch) | |
| tree | 2bb091560231fb693a0e63a6de36ecf53c321850 /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | |
| parent | 40d7f49b3e0320bd37b1ea4dcae7022a273f732e (diff) | |
Move all code to lookup JavaRuntimeInfo to static methods on
JavaRuntimeInfo.
Change-Id: Ic338dc9b3e5efa2fee92dba722a46cab743db40c
PiperOrigin-RevId: 182919931
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java index 43c3e916a1..060cf7eb1a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java @@ -50,7 +50,6 @@ import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts; import com.google.devtools.build.lib.rules.java.JavaCompilationHelper; import com.google.devtools.build.lib.rules.java.JavaConfiguration; -import com.google.devtools.build.lib.rules.java.JavaHelper; import com.google.devtools.build.lib.rules.java.JavaInfo; import com.google.devtools.build.lib.rules.java.JavaLibraryHelper; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider; @@ -269,14 +268,15 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured } } - JavaCompilationArtifacts artifacts = helper.build( - javaSemantics, - JavaCompilationHelper.getJavaToolchainProvider(ruleContext), - JavaHelper.getHostJavaRuntime(ruleContext), - JavaCompilationHelper.getInstrumentationJars(ruleContext), - JavaRuleOutputJarsProvider.builder(), - /*createOutputSourceJar*/false, - /*outputSourceJar=*/ null); + JavaCompilationArtifacts artifacts = + helper.build( + javaSemantics, + JavaCompilationHelper.getJavaToolchainProvider(ruleContext), + JavaRuntimeInfo.forHost(ruleContext), + JavaCompilationHelper.getInstrumentationJars(ruleContext), + JavaRuleOutputJarsProvider.builder(), + /*createOutputSourceJar*/ false, + /*outputSourceJar=*/ null); return helper.buildCompilationArgsProvider(artifacts, true /* isReportedAsStrict */); } |