Skip to content

Commit 36a3d8f

Browse files
katrecopybara-github
authored andcommitted
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
1 parent b20085a commit 36a3d8f

File tree

3 files changed

+0
-23
lines changed

3 files changed

+0
-23
lines changed

src/main/java/com/google/devtools/build/lib/bazel/BazelConfiguration.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,10 @@ public static class Options extends FragmentOptions {
4040
help = "If enabled, visibility checking also applies to toolchain implementations.")
4141
public boolean checkVisibilityForToolchains;
4242

43-
@Option(
44-
name = "incompatible_remove_exec_tools",
45-
defaultValue = "false",
46-
documentationCategory = OptionDocumentationCategory.UNCATEGORIZED,
47-
effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS},
48-
metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE},
49-
help = "If enabled, use of genrule's exec_tools attribute will cause an error..")
50-
public boolean removeExecTools;
51-
5243
@Override
5344
public FragmentOptions getExec() {
5445
Options exec = (Options) getDefault();
5546
exec.checkVisibilityForToolchains = checkVisibilityForToolchains;
56-
exec.removeExecTools = removeExecTools;
5747

5848
return exec;
5949
}

src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ java_library(
1818
"//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
1919
"//src/main/java/com/google/devtools/build/lib/analysis:config/execution_transition_factory",
2020
"//src/main/java/com/google/devtools/build/lib/analysis:rule_definition_environment",
21-
"//src/main/java/com/google/devtools/build/lib/bazel:bazel_configuration",
2221
"//src/main/java/com/google/devtools/build/lib/packages",
2322
"//src/main/java/com/google/devtools/build/lib/rules/genrule",
2423
"//src/main/java/com/google/devtools/build/lib/util:filetype",

src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRule.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
import com.google.devtools.build.lib.analysis.CommandHelper;
1818
import com.google.devtools.build.lib.analysis.RuleContext;
19-
import com.google.devtools.build.lib.bazel.BazelConfiguration;
20-
import com.google.devtools.build.lib.packages.BuildType;
2119
import com.google.devtools.build.lib.packages.Type;
2220
import com.google.devtools.build.lib.rules.genrule.GenRuleBase;
2321

@@ -38,16 +36,6 @@ protected boolean isStampingEnabled(RuleContext ruleContext) {
3836
// projects are migrated.
3937
@Override
4038
protected CommandHelper.Builder commandHelperBuilder(RuleContext ruleContext) {
41-
BazelConfiguration.Options bazelOptions =
42-
ruleContext.getConfiguration().getOptions().get(BazelConfiguration.Options.class);
43-
44-
if (bazelOptions.removeExecTools
45-
&& ruleContext.attributes().has("exec_tools", BuildType.LABEL_LIST)
46-
&& !ruleContext.attributes().get("exec_tools", BuildType.LABEL_LIST).isEmpty()) {
47-
ruleContext.attributeError(
48-
"exec_tools", "genrule.exec_tools has been removed, use tools instead");
49-
}
50-
5139
return CommandHelper.builder(ruleContext)
5240
.addToolDependencies("tools")
5341
.addToolDependencies("exec_tools")

0 commit comments

Comments
 (0)