1 files changed, 0 insertions, 62 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
index 99619bfdfb..84fafc2b0d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java
@@ -23,7 +23,6 @@ import com.google.devtools.build.lib.analysis.config.BuildOptions;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
-import com.google.devtools.build.lib.rules.apple.Platform;
 import com.google.devtools.build.lib.rules.objc.ReleaseBundlingSupport.SplitArchTransition.ConfigurationDistinguisher;
 import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter;
 import com.google.devtools.common.options.EnumConverter;
@@ -42,33 +41,6 @@ public class ObjcCommandLineOptions extends FragmentOptions {
     }
   }
 
-  /** Converter for --default_ios_provisioning_profile. */
-  public static class DefaultProvisioningProfileConverter extends DefaultLabelConverter {
-    public DefaultProvisioningProfileConverter() {
-      super(Constants.TOOLS_REPOSITORY + "//tools/objc:default_provisioning_profile");
-    }
-  }
-
-  // TODO(bazel-team): Validate version flag value.
-  @Option(name = "xcode_version",
-      defaultValue = "",
-      category = "undocumented",
-      help = "If specified, uses xcode of the given version for relevant build actions. "
-          + "If unspecified, uses the executor default version of xcode."
-      )
-  public String xcodeVersion;
-
-  // TODO(bazel-team): Validate version flag value.
-  @Option(name = "ios_sdk_version",
-      // TODO(bazel-team): Make this flag optional, and infer SDKROOT based on executor default.
-      defaultValue = DEFAULT_SDK_VERSION,
-      category = "build",
-      help = "Specifies the version of the iOS SDK to use to build iOS applications."
-      )
-  public String iosSdkVersion;
-
-  @VisibleForTesting static final String DEFAULT_SDK_VERSION = "8.4";
-
   @Option(name = "ios_simulator_version",
       defaultValue = "8.4",
       category = "run",
@@ -85,12 +57,6 @@ public class ObjcCommandLineOptions extends FragmentOptions {
           + "on the machine the simulator will be run on.")
   public String iosSimulatorDevice;
 
-  @Option(name = "ios_cpu",
-      defaultValue = DEFAULT_IOS_CPU,
-      category = "build",
-      help = "Specifies to target CPU of iOS compilation.")
-  public String iosCpu;
-
   @Option(name = "objc_generate_debug_symbols",
       defaultValue = "false",
       category = "flags",
@@ -116,14 +82,6 @@ public class ObjcCommandLineOptions extends FragmentOptions {
       help = "Enable checking for memory leaks in ios_test targets.")
   public boolean runMemleaks;
 
-  @Option(name = "ios_multi_cpus",
-      converter = CommaSeparatedOptionListConverter.class,
-      defaultValue = "",
-      category = "flags",
-      help = "Comma-separated list of architectures to build an ios_application with. The result "
-          + "is a universal binary containing all specified architectures.")
-  public List<String> iosMultiCpus;
-
   @Option(name = "ios_split_cpu",
       defaultValue = "",
       category = "undocumented",
@@ -137,12 +95,6 @@ public class ObjcCommandLineOptions extends FragmentOptions {
       converter = DumpSymsConverter.class)
   public Label dumpSyms;
 
-  @Option(name = "default_ios_provisiong_profile",
-      defaultValue = "",
-      category = "undocumented",
-      converter = DefaultProvisioningProfileConverter.class)
-  public Label defaultProvisioningProfile;
-
   @Option(name = "objc_per_proto_includes",
       defaultValue = "false",
       category = "undocumented",
@@ -225,26 +177,12 @@ public class ObjcCommandLineOptions extends FragmentOptions {
   public String xcodeOverrideWorkspaceRoot;
 
   @VisibleForTesting static final String DEFAULT_MINIMUM_IOS = "7.0";
-  @VisibleForTesting static final String DEFAULT_IOS_CPU = "x86_64";
 
   @Override
   public void addAllLabels(Multimap<String, Label> labelMap) {
     if (generateDebugSymbols) {
       labelMap.put("dump_syms", dumpSyms);
     }
-
-    if (getPlatform() == Platform.IOS_DEVICE) {
-      labelMap.put("default_provisioning_profile", defaultProvisioningProfile);
-    }
-  }
-
-  private Platform getPlatform() {
-    for (String architecture : iosMultiCpus) {
-      if (Platform.forArch(architecture) == Platform.IOS_DEVICE) {
-        return Platform.IOS_DEVICE;
-      }
-    }
-    return Platform.forArch(iosCpu);
   }
 
   @Override