From 3073f1b72fd6a9df758d059391b1f6791ea5eb1b Mon Sep 17 00:00:00 2001
From: Googler <noreply@google.com>
Date: Mon, 7 Mar 2022 15:34:32 -0800
Subject: [PATCH] Remove should_lipo argument from the Starlark interface
 apple_common.link_multi_arch_binary.

This feature is already a no-op, and rules_apple no longer references this argument.

PiperOrigin-RevId: 433056780
---
 .../build/lib/rules/objc/AppleStarlarkCommon.java      |  1 -
 .../lib/starlarkbuildapi/apple/AppleCommonApi.java     | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java
index 0f6b4bfec3e96e..cfaff6d7ec103a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AppleStarlarkCommon.java
@@ -261,7 +261,6 @@ public StructImpl linkMultiArchBinary(
       Sequence<?> extraLinkopts,
       Sequence<?> extraLinkInputs,
       StarlarkInt stamp,
-      Boolean shouldLipo,
       StarlarkThread thread)
       throws EvalException, InterruptedException {
     try {
diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleCommonApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleCommonApi.java
index 6daa73eb329ee6..0f0cec24a2e9c7 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleCommonApi.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/apple/AppleCommonApi.java
@@ -404,15 +404,6 @@ AppleExecutableBinaryApi newExecutableBinaryProvider(
                     + "If -1 (the default), then the behavior is determined by the --[no]stamp "
                     + "flag. This should be set to 0 when generating the executable output for "
                     + "test rules."),
-        // TODO(b/63092114): Remove should_lipo when the Apple BUILD rules no longer use it.
-        @Param(
-            name = "should_lipo",
-            named = true,
-            positional = false,
-            defaultValue = "False",
-            doc =
-                "No-op. Kept here for backwards compatibility. This field will be removed in a "
-                    + "future release.")
       },
       useStarlarkThread = true)
   // TODO(b/70937317): Iterate on, improve, and solidify this API.
@@ -422,7 +413,6 @@ StructApi linkMultiArchBinary(
       Sequence<?> extraLinkopts, // <String> expected.
       Sequence<?> extraLinkInputs, // <? extends FileApi> expected.
       StarlarkInt stamp,
-      Boolean shouldLipo,
       StarlarkThread thread)
       throws EvalException, InterruptedException;