diff options
| author |  carmi <carmi@google.com> | 2017-08-01 19:31:05 +0200 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2017-08-02 10:40:01 +0200 |
| commit | 71238601b8ca147cfd4f9498e11d8517b25ac69a (patch) | |
| tree | cdb18b38fd181552c5b034ff2fce6524abcce05a /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java | |
| parent | a2d101a755a99d4e44a259e98179993a81300912 (diff) | |
PiperOrigin-RevId: 163848560
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.java | 9 |
1 files changed, 8 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 3a49aeb10a..fb73faf2a9 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 @@ -22,6 +22,7 @@ import static com.google.devtools.build.lib.packages.Attribute.ConfigurationTran import static com.google.devtools.build.lib.packages.Attribute.attr; import static com.google.devtools.build.lib.packages.BuildType.LABEL; import static com.google.devtools.build.lib.rules.java.proto.JplCcLinkParams.createCcLinkParamsStore; +import static com.google.devtools.build.lib.rules.java.proto.StrictDepsUtils.createNonStrictCompilationArgsProvider; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; @@ -245,7 +246,13 @@ public class JavaProtoAspect extends NativeAspectClass implements ConfiguredAspe JavaSkylarkApiProvider.PROTO_NAME.getLegacyId(), JavaSkylarkApiProvider.fromProviderMap(javaProviders)) .addProvider( - new JavaProtoLibraryAspectProvider(javaProviders, transitiveOutputJars.build())); + new JavaProtoLibraryAspectProvider( + javaProviders, + transitiveOutputJars.build(), + createNonStrictCompilationArgsProvider( + javaProtoLibraryAspectProviders, + generatedCompilationArgsProvider.getJavaCompilationArgs(), + getProtoRuntimeDeps()))); } /** |