aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-05-12 21:54:32 +0200
committerGravatar Dmitry Lomov <dslomov@google.com>2017-05-15 19:51:00 +0200
commit729d48f682a9fcc830729e46a81c8f492ede7274 (patch)
tree5d7249dc2bb586f16667824803594f47b9680962 /src/main/java/com
parent645981c6ce0480b6c75002edf465d092ca5b25cf (diff)
Remove the strict_proto_deps attribute from the build language.
RELNOTES: proto_library.strict_proto_deps no longer exists. PiperOrigin-RevId: 155900531
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryRule.java2
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java11
2 files changed, 0 insertions, 13 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryRule.java b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryRule.java
index c0a6eb00aa..f88824f9e4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/BazelProtoLibraryRule.java
@@ -18,7 +18,6 @@ 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.packages.BuildType.LABEL_LIST;
-import static com.google.devtools.build.lib.packages.BuildType.TRISTATE;
import com.google.devtools.build.lib.analysis.BaseRuleClasses;
import com.google.devtools.build.lib.analysis.RuleDefinition;
@@ -72,7 +71,6 @@ public final class BazelProtoLibraryRule implements RuleDefinition {
attr("srcs", LABEL_LIST)
.direct_compile_time_input()
.allowedFileTypes(FileType.of(".proto"), FileType.of(".protodevel")))
- .add(attr("strict_proto_deps", TRISTATE).undocumented("for migration only"))
.advertiseProvider(ProtoSourcesProvider.class, ProtoSupportDataProvider.class)
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
index d14ae6e920..4cc8f0286d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoCommon.java
@@ -16,7 +16,6 @@ package com.google.devtools.build.lib.rules.proto;
import static com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode.TARGET;
import static com.google.devtools.build.lib.collect.nestedset.Order.STABLE_ORDER;
-import static com.google.devtools.build.lib.packages.BuildType.TRISTATE;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
@@ -31,7 +30,6 @@ import com.google.devtools.build.lib.cmdline.Label;
import com.google.devtools.build.lib.collect.nestedset.NestedSet;
import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
import com.google.devtools.build.lib.packages.BuildType;
-import com.google.devtools.build.lib.packages.TriState;
import com.google.devtools.build.lib.vfs.FileSystemUtils;
import com.google.devtools.build.lib.vfs.PathFragment;
import javax.annotation.Nullable;
@@ -213,15 +211,6 @@ public class ProtoCommon {
|| flagValue == BuildConfiguration.StrictDepsMode.WARN) {
return true;
}
-
- TriState attrValue = ruleContext.attributes().get("strict_proto_deps", TRISTATE);
- if (attrValue == TriState.NO) {
- return false;
- }
- if (attrValue == TriState.YES) {
- return true;
- }
-
return (flagValue == BuildConfiguration.StrictDepsMode.STRICT);
}
}