aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main
diff options
context:
space:
mode:
authorGravatar tomlu <tomlu@google.com>2017-06-22 17:30:47 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-06-26 18:29:46 +0200
commitb82e3d014b68e5bf220129aa3bbd59bbaa4afa7f (patch)
tree13c6dda600144c168fe6319ea24f0427724d3d01 /src/main
parent3fdb9174105b8ca7373800b36d7dfa829ed5122b (diff)
Expose the correct JavaSkylarkApiProvider from JavaProtoAspect.
To unblock, regression tests for the breakage will come in a follow-up CL. PiperOrigin-RevId: 159829368
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java4
1 files changed, 3 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 145f955c6b..2e50fca863 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
@@ -235,7 +235,9 @@ public class JavaProtoAspect extends NativeAspectClass implements ConfiguredAspe
javaProvidersBuilder.add(generatedCompilationArgsProvider);
TransitiveInfoProviderMap javaProviders = javaProvidersBuilder.build();
aspect
- .addSkylarkTransitiveInfo(JavaSkylarkApiProvider.PROTO_NAME.getLegacyId(), javaProviders)
+ .addSkylarkTransitiveInfo(
+ JavaSkylarkApiProvider.PROTO_NAME.getLegacyId(),
+ JavaSkylarkApiProvider.fromProviderMap(javaProviders))
.addProvider(
new JavaProtoLibraryAspectProvider(javaProviders, transitiveOutputJars.build()));
}