Remove support for `--check_constaint=`
PiperOrigin-RevId: 362391713
diff --git a/site/docs/user-manual.html b/site/docs/user-manual.html
index 0072e33..a348edf 100644
--- a/site/docs/user-manual.html
+++ b/site/docs/user-manual.html
@@ -102,28 +102,6 @@
These options control Bazel's error-checking and/or warnings.
</p>
-<h4 id='flag--check_constraint'><code class='flag'>--check_constraint=<var>constraint</var></code></h4>
-<p>
- This option takes an argument that specifies which constraint
- should be checked.
-</p>
-<p>
- Bazel performs special checks on each rule that is annotated with the
- given constraint.
-</p>
-<p>
- The supported constraints and their checks are as follows:
-</p>
-<ul>
-
- <li><code>public</code>: Verify that all java_libraries marked with
- <code>constraints = ['public']</code> only depend on java_libraries
- that are marked as <code>constraints = ['public']</code> too. If bazel
- finds a dependency that does not conform to this rule, bazel will issue
- an error.
- </li>
-</ul>
-
<h4 id='flag--check_visibility'><code class='flag'>--[no]check_visibility</code></h4>
<p>
If this option is set to false, visibility checks are demoted to warnings.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
index 8e993d0..d69235e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java
@@ -138,24 +138,6 @@
}
/**
- * Validates that the packages listed under "deps" all have the given constraint. If a package
- * does not have this attribute, an error is generated.
- */
- public static final void validateConstraint(
- RuleContext ruleContext,
- String constraint,
- Iterable<? extends TransitiveInfoCollection> targets) {
- for (TransitiveInfoCollection target : targets) {
- JavaInfo javaInfo = JavaInfo.getJavaInfo(target);
- if (javaInfo != null && !javaInfo.getJavaConstraints().contains(constraint)) {
- ruleContext.attributeError(
- "deps",
- String.format("%s: does not have constraint '%s'", target.getLabel(), constraint));
- }
- }
- }
-
- /**
* Creates an action to aggregate all metadata artifacts into a single
* <target_name>_instrumented.jar file.
*/
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
index 6769bc1..8bcc9c0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaConfiguration.java
@@ -93,7 +93,6 @@
private final JavaClasspathMode javaClasspath;
private final boolean inmemoryJdepsFiles;
private final ImmutableList<String> defaultJvmFlags;
- private final ImmutableList<String> checkedConstraints;
private final StrictDepsMode strictJavaDeps;
private final String fixDepsTool;
private final Label proguardBinary;
@@ -133,7 +132,6 @@
this.javaClasspath = javaOptions.javaClasspath;
this.inmemoryJdepsFiles = javaOptions.inmemoryJdepsFiles;
this.defaultJvmFlags = ImmutableList.copyOf(javaOptions.jvmOpts);
- this.checkedConstraints = ImmutableList.copyOf(javaOptions.checkedConstraints);
this.strictJavaDeps = javaOptions.strictJavaDeps;
this.fixDepsTool = javaOptions.fixDepsTool;
this.proguardBinary = javaOptions.proguard;
@@ -269,10 +267,6 @@
return defaultJvmFlags;
}
- public ImmutableList<String> getCheckedConstraints() {
- return checkedConstraints;
- }
-
public StrictDepsMode getStrictJavaDeps() {
return strictJavaDeps;
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
index 3ad9cb6..7608dd7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -446,13 +446,14 @@
help = "The message translations used for translating messages in Java targets.")
public List<String> translationTargets;
+ @Deprecated
@Option(
name = "check_constraint",
allowMultiple = true,
defaultValue = "null",
- documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
+ documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
effectTags = {OptionEffectTag.UNKNOWN},
- help = "Check the listed constraint.")
+ help = "No-op. Kept here for backwards compatibility.")
public List<String> checkedConstraints;
@Option(
@@ -762,8 +763,6 @@
host.isJlplStrictDepsEnforced = isJlplStrictDepsEnforced;
- host.requireJavaToolchainHeaderCompilerDirect = requireJavaToolchainHeaderCompilerDirect;
-
host.disallowResourceJars = disallowResourceJars;
host.javaRuntimeVersion = hostJavaRuntimeVersion;
