diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java index 28502432cf3c13..555db68b817c16 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java @@ -753,12 +753,6 @@ public boolean isToolConfiguration() { return isExecConfiguration(); } - @Override - public boolean isToolConfigurationForStarlark(StarlarkThread thread) throws EvalException { - BuiltinRestriction.failIfCalledOutsideDefaultAllowlist(thread); - return isToolConfiguration(); - } - public boolean checkVisibility() { return options.checkVisibility; } diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BuildConfigurationApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BuildConfigurationApi.java index 9f4f06711070ac..08a74b8eecbc61 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BuildConfigurationApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BuildConfigurationApi.java @@ -98,8 +98,10 @@ public interface BuildConfigurationApi extends StarlarkValue { @StarlarkMethod(name = "stamp_binaries", documented = false, useStarlarkThread = true) boolean stampBinariesForStarlark(StarlarkThread thread) throws EvalException; - @StarlarkMethod(name = "is_tool_configuration", documented = false, useStarlarkThread = true) - boolean isToolConfigurationForStarlark(StarlarkThread thread) throws EvalException; + @StarlarkMethod( + name = "is_tool_configuration", + doc = "Returns true when building in the tool (exec) configuration.") + boolean isToolConfiguration(); @StarlarkMethod( name = "has_separate_genfiles_directory", diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationStarlarkTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationStarlarkTest.java index 303dac3739544e..266ad35bcf6ea7 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationStarlarkTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationStarlarkTest.java @@ -77,7 +77,7 @@ def _test_rule_impl(ctx): } @Test - public void testIsToolConfigurationIsBlocked() throws Exception { + public void testIsToolConfiguration() throws Exception { scratch.file( "example/BUILD", """ @@ -90,15 +90,14 @@ public void testIsToolConfigurationIsBlocked() throws Exception { "example/rule.bzl", """ def _impl(ctx): - ctx.configuration.is_tool_configuration() + if ctx.configuration.is_tool_configuration(): + fail("should not be tool configuration") return [DefaultInfo()] custom_rule = rule(implementation = _impl) """); - AssertionError e = - assertThrows(AssertionError.class, () -> getConfiguredTarget("//example:custom")); - assertThat(e).hasMessageThat().contains("file '//example:rule.bzl' cannot use private API"); + getConfiguredTarget("//example:custom"); } @Test