aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/packages
diff options
context:
space:
mode:
authorGravatar Greg Estren <gregce@google.com>2015-09-24 19:57:54 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-09-25 14:40:19 +0000
commit875c7a7b13b77ed65ceab1fe71d6c50e9647e36b (patch)
treeef501a986d33bea6cdd8d5f20c05ad10efda9a61 /src/main/java/com/google/devtools/build/lib/packages
parent2833b42de91191632d64afe4a4d82c0aee26ad3d (diff)
Change Attribute.skipConstraintsCheck() (and similar methods)
to Attribute.skipPrereqValidatorCheck. This is to disambiguate the concept of "constraints" and keep the word consciously focused on Bazel's *new* constraint system. The changed methods refer to checks done by PrerequisiteValidator, which is basically an adhoc version of the "old" system (e.g. checking visibility) -- MOS_MIGRATED_REVID=103872412
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/packages')
-rw-r--r--src/main/java/com/google/devtools/build/lib/packages/Attribute.java18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
index b94b172fe1..a63da70eec 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/Attribute.java
@@ -204,9 +204,11 @@ public final class Attribute implements Comparable<Attribute> {
NONCONFIGURABLE,
/**
- * Whether we should skip constraints checks for licenses, visibility, etc.
+ * Whether we should skip dependency validation checks done by
+ * {@link com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.PrerequisiteValidator}
+ * (for visibility, etc.).
*/
- SKIP_CONSTRAINTS_CHECKS,
+ SKIP_PREREQ_VALIDATOR_CHECKS,
}
// TODO(bazel-team): modify this interface to extend Predicate and have an extra error
@@ -527,10 +529,12 @@ public final class Attribute implements Comparable<Attribute> {
}
/**
- * Disables constraints and visibility checks.
+ * Disables dependency checks done by
+ * {@link com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.PrerequisiteValidator}.
*/
- public Builder<TYPE> skipConstraintsCheck() {
- return setPropertyFlag(PropertyFlag.SKIP_CONSTRAINTS_CHECKS, "skip_constraints_checks");
+ public Builder<TYPE> skipPrereqValidatorCheck() {
+ return setPropertyFlag(PropertyFlag.SKIP_PREREQ_VALIDATOR_CHECKS,
+ "skip_prereq_validator_checks");
}
/**
@@ -1251,8 +1255,8 @@ public final class Attribute implements Comparable<Attribute> {
return getPropertyFlag(PropertyFlag.CHECK_ALLOWED_VALUES);
}
- public boolean performConstraintsCheck() {
- return !getPropertyFlag(PropertyFlag.SKIP_CONSTRAINTS_CHECKS);
+ public boolean performPrereqValidatorCheck() {
+ return !getPropertyFlag(PropertyFlag.SKIP_PREREQ_VALIDATOR_CHECKS);
}
/**