From dce861d7c1a13164851fc9070756b946969c5e41 Mon Sep 17 00:00:00 2001 From: John Cater Date: Wed, 10 Mar 2021 09:26:41 -0800 Subject: [PATCH] Update the open source filegroup rule to disable toolchain resolution. The internal version of this rule has toolchain resolution disabled, and this has been widely documented, so it is easiest to update the external version of the rule to match. Closes #13194. PiperOrigin-RevId: 362067102 --- .../build/lib/bazel/rules/common/BazelFilegroupRule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java index 0982e703a685b2..85faab11d831e1 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/common/BazelFilegroupRule.java @@ -22,6 +22,7 @@ import com.google.devtools.build.lib.analysis.RuleDefinition; import com.google.devtools.build.lib.analysis.RuleDefinitionEnvironment; import com.google.devtools.build.lib.packages.RuleClass; +import com.google.devtools.build.lib.packages.RuleClass.ToolchainResolutionMode; import com.google.devtools.build.lib.rules.filegroup.Filegroup; import com.google.devtools.build.lib.util.FileTypeSet; @@ -75,6 +76,7 @@ public RuleClass build(RuleClass.Builder builder, RuleDefinitionEnvironment env) attr("path", STRING) .undocumented( "only used to expose FilegroupPathProvider, which is not currently used")) + .useToolchainResolution(ToolchainResolutionMode.DISABLED) .build(); }