Remove --incompatible_remove_exec_tools.

It does not appear to usefully detect projects which use `genrule.exec_tools`. Part of #19132. PiperOrigin-RevId: 552783498 Change-Id: I88806b024c58f85ae0de284dd0ff513fe4cdfe1e
bazelbuild · Aug 1, 2023 · 36a3d8f · 36a3d8f
1 parent b20085a
commit 36a3d8f
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 23 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelConfiguration.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelConfiguration.java
@@ -40,20 +40,10 @@ public static class Options extends FragmentOptions {
         help = "If enabled, visibility checking also applies to toolchain implementations.")
     public boolean checkVisibilityForToolchains;
 
-    @Option(
-        name = "incompatible_remove_exec_tools",
-        defaultValue = "false",
-        documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
-        effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
-        metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
-        help = "If enabled, use of genrule's exec_tools attribute will cause an error..")
-    public boolean removeExecTools;
-
     @Override
     public FragmentOptions getExec() {
       Options exec = (Options) getDefault();
       exec.checkVisibilityForToolchains = checkVisibilityForToolchains;
-      exec.removeExecTools = removeExecTools;
 
       return exec;
     }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BUILD
@@ -18,7 +18,6 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
         "//src/main/java/com/google/devtools/build/lib/analysis:config/execution_transition_factory",
         "//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment",
-        "//src/main/java/com/google/devtools/build/lib/bazel:bazel_configuration",
         "//src/main/java/com/google/devtools/build/lib/packages",
         "//src/main/java/com/google/devtools/build/lib/rules/genrule",
         "//src/main/java/com/google/devtools/build/lib/util:filetype",

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRule.java
@@ -16,8 +16,6 @@
 
 import com.google.devtools.build.lib.analysis.CommandHelper;
 import com.google.devtools.build.lib.analysis.RuleContext;
-import com.google.devtools.build.lib.bazel.BazelConfiguration;
-import com.google.devtools.build.lib.packages.BuildType;
 import com.google.devtools.build.lib.packages.Type;
 import com.google.devtools.build.lib.rules.genrule.GenRuleBase;
 
@@ -38,16 +36,6 @@ protected boolean isStampingEnabled(RuleContext ruleContext) {
   // projects are migrated.
   @Override
   protected CommandHelper.Builder commandHelperBuilder(RuleContext ruleContext) {
-    BazelConfiguration.Options bazelOptions =
-        ruleContext.getConfiguration().getOptions().get(BazelConfiguration.Options.class);
-
-    if (bazelOptions.removeExecTools
-        && ruleContext.attributes().has("exec_tools", BuildType.LABEL_LIST)
-        && !ruleContext.attributes().get("exec_tools", BuildType.LABEL_LIST).isEmpty()) {
-      ruleContext.attributeError(
-          "exec_tools", "genrule.exec_tools has been removed, use tools instead");
-    }
-
     return CommandHelper.builder(ruleContext)
         .addToolDependencies("tools")
         .addToolDependencies("exec_tools")