From b82e3d014b68e5bf220129aa3bbd59bbaa4afa7f Mon Sep 17 00:00:00 2001 From: tomlu Date: Thu, 22 Jun 2017 17:30:47 +0200 Subject: Expose the correct JavaSkylarkApiProvider from JavaProtoAspect. To unblock, regression tests for the breakage will come in a follow-up CL. PiperOrigin-RevId: 159829368 --- .../google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/main') 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())); } -- cgit v1.2.3