BEGIN_PUBLIC

Final removal of `copy_from_rule` from exec_groups. See #17668. END_PUBLIC PiperOrigin-RevId: 518213763 Change-Id: I9411481b44c65bb79928492457ec3b0a4d33da73
bazelbuild · Mar 21, 2023 · f48412f · f48412f
1 parent 4973166
commit f48412f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git a/...main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java b/...main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
@@ -1045,19 +1045,8 @@ public Label label(Object input, StarlarkThread thread) throws EvalException {
 
   @Override
   public ExecGroup execGroup(
-      Sequence<?> toolchains,
-      Sequence<?> execCompatibleWith,
-      Boolean copyFromRule,
-      StarlarkThread thread)
+      Sequence<?> toolchains, Sequence<?> execCompatibleWith, StarlarkThread thread)
       throws EvalException {
-    if (copyFromRule) {
-      if (!toolchains.isEmpty() || !execCompatibleWith.isEmpty()) {
-        throw Starlark.errorf(
-            "An exec group cannot set copy_from_rule=True and declare toolchains or constraints.");
-      }
-      return ExecGroup.copyFromDefault();
-    }
-
     ImmutableSet<ToolchainTypeRequirement> toolchainTypes = parseToolchainTypes(toolchains, thread);
     ImmutableSet<Label> constraints = parseExecCompatibleWith(execCompatibleWith, thread);
     return ExecGroup.builder()

diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkRuleFunctionsApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkRuleFunctionsApi.java
@@ -756,21 +756,9 @@ StarlarkAspectApi aspect(
             positional = false,
             defaultValue = "[]",
             doc = "A list of constraints on the execution platform."),
-        @Param(
-            name = "copy_from_rule",
-            defaultValue = "False",
-            named = true,
-            positional = false,
-            doc =
-                "If set to true, this exec group inherits the toolchains and constraints of the"
-                    + " rule to which this group is attached. If set to any other string this will"
-                    + " throw an error.")
       },
       useStarlarkThread = true)
   ExecGroupApi execGroup(
-      Sequence<?> execCompatibleWith,
-      Sequence<?> toolchains,
-      Boolean copyFromRule,
-      StarlarkThread thread)
+      Sequence<?> execCompatibleWith, Sequence<?> toolchains, StarlarkThread thread)
       throws EvalException;
 }
diff --git a/...main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkRuleFunctionsApi.java b/...main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeStarlarkRuleFunctionsApi.java
@@ -243,10 +243,7 @@ public StarlarkAspectApi aspect(
 
   @Override
   public ExecGroupApi execGroup(
-      Sequence<?> execCompatibleWith,
-      Sequence<?> toolchains,
-      Boolean copyFromRule,
-      StarlarkThread thread) {
+      Sequence<?> execCompatibleWith, Sequence<?> toolchains, StarlarkThread thread) {
     return new FakeExecGroup();
   }