aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/rules/java
diff options
context:
space:
mode:
authorGravatar twerth <twerth@google.com>2018-07-24 05:09:14 -0700
committerGravatar Copybara-Service <copybara-piper@google.com>2018-07-24 05:10:33 -0700
commit0b2f868885b1a7162d85ce43d28383a759ec4e92 (patch)
tree1f1fbc80151e93c033bd26aa5ed3646cb2f0ff8b /src/main/java/com/google/devtools/build/lib/rules/java
parent2b4a22c752e112181fa0841407a7a95966ff847f (diff)
Treat java_lite_proto_library and java_mutable_proto_library the same as we
treat java_proto_library. RELNOTES: None PiperOrigin-RevId: 205812269
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
index cb9be32ef6..1397746ecf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoLibrary.java
@@ -40,6 +40,7 @@ import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider;
import com.google.devtools.build.lib.rules.java.JavaRunfilesProvider;
import com.google.devtools.build.lib.rules.java.JavaSkylarkApiProvider;
import com.google.devtools.build.lib.rules.java.JavaSourceJarsProvider;
+import com.google.devtools.build.lib.rules.java.JavaStrictCompilationArgsProvider;
import com.google.devtools.build.lib.rules.java.ProguardLibrary;
import com.google.devtools.build.lib.rules.java.ProguardSpecProvider;
@@ -55,6 +56,10 @@ public class JavaLiteProtoLibrary implements RuleConfiguredTargetFactory {
JavaCompilationArgsProvider dependencyArgsProviders =
constructJcapFromAspectDeps(ruleContext, javaProtoLibraryAspectProviders);
+ JavaStrictCompilationArgsProvider strictDependencyArgsProviders =
+ new JavaStrictCompilationArgsProvider(
+ constructJcapFromAspectDeps(
+ ruleContext, javaProtoLibraryAspectProviders, /* alwaysStrict= */ true));
// We assume that the runtime jars will not have conflicting artifacts
// with the same root relative path
@@ -81,6 +86,7 @@ public class JavaLiteProtoLibrary implements RuleConfiguredTargetFactory {
JavaInfo javaInfo =
JavaInfo.Builder.create()
.addProvider(JavaCompilationArgsProvider.class, dependencyArgsProviders)
+ .addProvider(JavaStrictCompilationArgsProvider.class, strictDependencyArgsProviders)
.addProvider(JavaSourceJarsProvider.class, sourceJarsProvider)
.addProvider(JavaRuleOutputJarsProvider.class, JavaRuleOutputJarsProvider.EMPTY)
.addProvider(JavaRunfilesProvider.class, javaRunfilesProvider)