From ce103fabab67f49fe2fe62fd6c26d091c8743a9b Mon Sep 17 00:00:00 2001 From: Ivo List Date: Wed, 9 Nov 2022 12:01:16 +0100 Subject: [PATCH] Passing useToolchainResolution to make it compatible with Bazel 5.x.x --- .../build/lib/analysis/starlark/StarlarkRuleClassFunctions.java | 2 ++ .../devtools/build/lib/rules/test/StarlarkTestingModule.java | 1 + 2 files changed, 3 insertions(+) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java index 637d4718e9cd57..5cfabf53d8c501 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java @@ -317,6 +317,7 @@ public StarlarkRuleFunction rule( hostFragments, starlarkTestable, toolchains, + useToolchainTransition, providesArg, execCompatibleWith, analysisTest, @@ -339,6 +340,7 @@ public static StarlarkRuleFunction createRule( Sequence hostFragments, boolean starlarkTestable, Sequence toolchains, + boolean useToolchainTransition, Sequence providesArg, Sequence execCompatibleWith, Object analysisTest, diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java b/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java index aa4db61f82475a..96ac7a056b4e81 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java @@ -84,6 +84,7 @@ public void analysisTest( /*hostFragments=*/ StarlarkList.empty(), /*starlarkTestable=*/ false, /*toolchains=*/ toolchains, + /*useToolchainTransition=*/ false, /*providesArg=*/ StarlarkList.empty(), /*execCompatibleWith=*/ StarlarkList.empty(), /*analysisTest=*/ Boolean.TRUE,