Remove --ios_cpu flag

This flag appears to be unused, it was set once but never read. Instead users should prefer `--ios_multi_cpus` or `--cpu=ios_XXX`
bazelbuild · Aug 19, 2021 · 237559e · 237559e
1 parent 249511e
commit 237559e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 15 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java
@@ -178,7 +178,6 @@ public class AppleCommandLineOptions extends FragmentOptions {
   @VisibleForTesting public static final String DEFAULT_WATCHOS_SDK_VERSION = "2.0";
   @VisibleForTesting public static final String DEFAULT_MACOS_SDK_VERSION = "10.10";
   @VisibleForTesting public static final String DEFAULT_TVOS_SDK_VERSION = "9.0";
-  @VisibleForTesting static final String DEFAULT_IOS_CPU = "x86_64";
 
   /** The default watchos CPU value. */
   public static final String DEFAULT_WATCHOS_CPU = "i386";
@@ -193,16 +192,6 @@ public class AppleCommandLineOptions extends FragmentOptions {
   /** The default Catalyst CPU value. */
   public static final String DEFAULT_CATALYST_CPU = "x86_64";
 
-  @Option(
-    name = "ios_cpu",
-    defaultValue = DEFAULT_IOS_CPU,
-    documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS,
-    effectTags = {OptionEffectTag.NO_OP},
-    metadataTags = {OptionMetadataTag.DEPRECATED},
-    help = "Specifies to target CPU of iOS compilation."
-  )
-  public String iosCpu;
-
   @Option(
     name = "apple_compiler",
     defaultValue = "null",

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java
@@ -310,10 +310,6 @@ public final Map<String, BuildOptions> split(
 
         appleCommandLineOptions.applePlatformType = platformType;
         appleCommandLineOptions.appleSplitCpu = cpu;
-        // If the new configuration does not use the apple crosstool, then it needs ios_cpu to be
-        // to decide architecture.
-        // TODO(b/29355778, b/28403953): Use a crosstool for any apple rule. Deprecate ios_cpu.
-        appleCommandLineOptions.iosCpu = cpu;
 
         String platformCpu = ApplePlatform.cpuStringForTarget(platformType, cpu);
         if (splitOptions.get(ObjcCommandLineOptions.class).enableCcDeps) {