commit 66844df726f5a6c1d6f4bc5755d3af0c6ce3662c
author cmita <cmita@google.com> Tue Oct 06 01:37:59 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Oct 06 01:39:03 2020 -0700
tree 374c560b96719c18b769763a2d5602be2ca220ce
parent a991db7c2f66a354666388d888dcef9b0d0f70c0

Add source jar to transitive jars in JavaProtoAspect

Ensures the source jar for java_proto_library is included in the set of
transitive source jars as is expected.

Fixes https://github.com/bazelbuild/bazel/issues/11830

PiperOrigin-RevId: 335592987

src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java

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 cf1da52..7b026ff 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
@@ -236,7 +236,7 @@
                 .build();
         JavaSourceJarsProvider sourceJarsProvider =
             JavaSourceJarsProvider.create(
-                NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER),
+                NestedSetBuilder.create(Order.STABLE_ORDER, sourceJar),
                 ImmutableList.of(sourceJar));
 
         aspect.addProvider(ruleOutputJarsProvider).addProvider(sourceJarsProvider);