aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2018-07-30 07:48:47 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-07-30 07:51:07 -0700
commit008e5f8d80dcf2c1eb8c152684d222c95a402d19 (patch)
treed1725515b16318686bdaf1e667d4e06a7c28ec2d /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
parent3082654a566514b4f0535410cba6a51580471df8 (diff)
Add manifestProtoOutput produced during Java compilation to the OutputJar so that it can be accessed in Skylark. One example where this is used is in Android IDL processing where the manifestProtoOutput is used to split out the Android IDL generated Java classes from the overarching outputJar produced by the android_library rule.
RELNOTES: none PiperOrigin-RevId: 206580880
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
index 2df7c12d15..a86f703e9b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java
@@ -217,7 +217,11 @@ public class JavaProtoAspect extends NativeAspectClass implements ConfiguredAspe
// TODO(carmi): Expose to native rules
JavaRuleOutputJarsProvider ruleOutputJarsProvider =
JavaRuleOutputJarsProvider.builder()
- .addOutputJar(outputJar, compileTimeJar, ImmutableList.of(sourceJar))
+ .addOutputJar(
+ outputJar,
+ compileTimeJar,
+ null /* manifestProto */,
+ ImmutableList.of(sourceJar))
.build();
JavaSourceJarsProvider sourceJarsProvider =
JavaSourceJarsProvider.create(