Remove obsolete and deprecated xcode_options flag. RELNOTES: Remove deprecated xcode_options flag. -- MOS_MIGRATED_REVID=103311963
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",
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; }