commit 159b74c8b96622428840bf9918cce3b95021b095
author Googler <noreply@google.com> Thu Sep 17 18:57:26 2015 +0000
committer David Chen <dzc@google.com> Thu Sep 17 19:36:06 2015 +0000
tree cfa2e2a01324c0f7f30f32bc4302e92a3f2861cd
parent d31644256b8dde0f894cd57ac9d62bb01f598cbf

Remove obsolete and deprecated xcode_options flag.


RELNOTES: Remove deprecated xcode_options flag.

--
MOS_MIGRATED_REVID=103311963

src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java

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 08a69a6..8228117 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
@@ -73,13 +73,6 @@
       help = "Specifies to target CPU of iOS compilation.")
   public String iosCpu;
 
-  @Option(name = "xcode_options",
-      defaultValue = "Debug",
-      category = "undocumented",
-      deprecationWarning = "Use --compilation_mode instead.",
-      help = "Specifies the name of the build settings to use.")
-  public String xcodeOptions;
-
   @Option(name = "objc_generate_debug_symbols",
       defaultValue = "false",
       category = "undocumented",

src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
index 9209c4e..91204c6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcConfiguration.java
@@ -55,7 +55,6 @@
   private final String iosSimulatorVersion;
   private final String iosSimulatorDevice;
   private final String iosCpu;
-  private final String xcodeOptions;
   private final Optional<String> xcodeVersionOverride;
   private final boolean generateDebugSymbols;
   private final boolean runMemleaks;
@@ -92,7 +91,6 @@
     this.iosSimulatorVersion =
         Preconditions.checkNotNull(objcOptions.iosSimulatorVersion, "iosSimulatorVersion");
     this.iosCpu = Preconditions.checkNotNull(objcOptions.iosCpu, "iosCpu");
-    this.xcodeOptions = Preconditions.checkNotNull(objcOptions.xcodeOptions, "xcodeOptions");
     this.generateDebugSymbols = objcOptions.generateDebugSymbols;
     this.runMemleaks = objcOptions.runMemleaks;
     this.copts = ImmutableList.copyOf(objcOptions.copts);
@@ -171,10 +169,6 @@
     return Platform.forArch(getIosCpu());
   }
 
-  public String getXcodeOptions() {
-    return xcodeOptions;
-  }
-
   public boolean generateDebugSymbols() {
     return generateDebugSymbols;
   }