diff options
| author |  cushon <cushon@google.com> | 2018-04-24 00:59:04 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-04-24 01:00:10 -0700 |
| commit | e6febea501c0763b18e31fd2094aab928faf53e5 (patch) | |
| tree | 77d970e32d344e104c19f16b79c1f7811ce34a86 /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java | |
| parent | 44ae7946052f3a6c4c1042e6b97854fe4c13e626 (diff) | |
Add getters to JavaCompilationArgsProvider
for direct, transitive, and full compile-time jars; runtime jars; and instrumentation
metadata. These are trivial wrappers around the corresponding getters on the recursive
and non-recursive JavaCompilationArgs objects.
This is a no-op refactoring in preparation for flatting JavaCompilationArgs into JavaCompilationArgsProvider.
PiperOrigin-RevId: 194047064
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 | 5 |
1 files changed, 2 insertions, 3 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 8a4056bd06..31f7d9e84a 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 @@ -198,8 +198,7 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured transitiveOutputJars.add(outputJar); Artifact compileTimeJar = - getOnlyElement( - generatedCompilationArgsProvider.getJavaCompilationArgs().getCompileTimeJars()); + getOnlyElement(generatedCompilationArgsProvider.getDirectCompileTimeJars()); // TODO(carmi): Expose to native rules JavaRuleOutputJarsProvider ruleOutputJarsProvider = JavaRuleOutputJarsProvider.builder() @@ -232,7 +231,7 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured transitiveOutputJars.build(), createNonStrictCompilationArgsProvider( javaProtoLibraryAspectProviders, - generatedCompilationArgsProvider.getJavaCompilationArgs(), + generatedCompilationArgsProvider, aspectCommon.getProtoRuntimeDeps()))); } |