diff options
| author |  Liam Miller-Cushon <cushon@google.com> | 2017-01-11 23:27:22 +0000 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-01-12 09:11:47 +0000 |
| commit | f2ad3c2a017fc7b643744074ca16053a35533a30 (patch) | |
| tree | 97de01c22949f776c89b73e94a340b57fe38c598 /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | |
| parent | cef31384524948f2c4ffdb2944ca93cc2d18fe30 (diff) | |
Consolidate host javabase input lookup
--
PiperOrigin-RevId: 144257691
MOS_MIGRATED_REVID=144257691
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 | 12 |
1 files changed, 7 insertions, 5 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 477f624c6f..386b7b390f 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,6 +50,7 @@ import com.google.devtools.build.lib.rules.java.JavaCompilationArgs; import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; 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.JavaLibraryHelper; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider; import com.google.devtools.build.lib.rules.java.JavaSemantics; @@ -250,11 +251,12 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured helper.addDep(runtime.getProvider(JavaCompilationArgsProvider.class)); } helper.setCompilationStrictDepsMode(StrictDepsMode.OFF); - JavaCompilationArgs artifacts = helper.build( - javaSemantics, - JavaCompilationHelper.getJavaToolchainProvider(ruleContext), - JavaCompilationHelper.getHostJavabaseInputsNonStatic(ruleContext), - JavaCompilationHelper.getInstrumentationJars(ruleContext)); + JavaCompilationArgs artifacts = + helper.build( + javaSemantics, + JavaCompilationHelper.getJavaToolchainProvider(ruleContext), + JavaHelper.getHostJavabaseInputs(ruleContext), + JavaCompilationHelper.getInstrumentationJars(ruleContext)); return helper.buildCompilationArgsProvider(artifacts, true /* isReportedAsStrict */); } |