From c061e57a7004a88eeb2f84d094d9a88b56c146b6 Mon Sep 17 00:00:00 2001 From: Googler Date: Thu, 27 Jul 2023 09:02:43 -0700 Subject: [PATCH] Remove the deprecated `exec_tools` attribute from `genrule`. RELNOTES: The `genrule` attribute `exec_tools` is removed. It has been identical to the `tools` attribute since Bazel 6.0 and uses should be updated. PiperOrigin-RevId: 551546902 Change-Id: Ia59bf5db9c1c2c0d8828273c82762f8455e5f2f4 --- .../build/lib/rules/genrule/GenRuleBase.java | 1 - .../build/lib/rules/genrule/GenRuleBaseRule.java | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java index 2e176731dde46f..ecbcfbfdf9de3e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java +++ b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBase.java @@ -289,7 +289,6 @@ public String toString() { protected CommandHelper.Builder commandHelperBuilder(RuleContext ruleContext) { return CommandHelper.builder(ruleContext) .addToolDependencies("tools") - .addToolDependencies("exec_tools") .addToolDependencies("toolchains"); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBaseRule.java index 57bb1991a8fc08..bfecb964386e6b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBaseRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBaseRule.java @@ -85,21 +85,6 @@ public RuleClass build( .cfg(ExecutionTransitionFactory.createFactory()) .allowedFileTypes(FileTypeSet.ANY_FILE)) - /* - Deprecated. Use tools instead. - -

- There was a period of time when exec_tools and tools behaved - differently, but they are now equivalent and the Blaze team will be migrating all uses of - exec_tools to tools. -

- */ - .add( - attr("exec_tools", LABEL_LIST) - .cfg(ExecutionTransitionFactory.createFactory()) - .allowedFileTypes(FileTypeSet.ANY_FILE) - .dontCheckConstraints()) - /* A list of files generated by this rule.