diff options
author | dmishe <dmishe@google.com> | 2017-12-21 01:19:47 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-12-21 01:21:41 -0800 |
commit | d4e3ce6531c60b08085d2d2fcb76b2b141b6e77d (patch) | |
tree | e3e301a49c1f3d7fdf606167a8ba6c13fb0652f5 /src/main/java/com/google/devtools/build/lib/rules/apple | |
parent | 8268c56e27494d345077720e129fda05c40b0514 (diff) |
Remove xcode_toolchain flag
PiperOrigin-RevId: 179785531
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/apple')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java | 15 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java | 14 |
2 files changed, 0 insertions, 29 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 index 73a54fc9f1..fbc5363f7b 100644 --- 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 @@ -334,19 +334,6 @@ public class AppleCommandLineOptions extends FragmentOptions { } } - // TODO(b/68330014): Deprecate and remove this flag. - @Option( - name = "xcode_toolchain", - defaultValue = "null", - category = "flags", - documentationCategory = OptionDocumentationCategory.TOOLCHAIN, - effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, - help = - "The identifier of an Xcode toolchain to use for builds. Currently only the toolchains " - + "that ship with Xcode are supported." - ) - public String xcodeToolchain; - @Option( name = "apple_bitcode", converter = AppleBitcodeMode.Converter.class, @@ -545,7 +532,6 @@ public class AppleCommandLineOptions extends FragmentOptions { STRING_LIST_CODEC.serialize((ImmutableList<String>) macosCpus, out); LabelCodec.INSTANCE.serialize(defaultProvisioningProfile, out); LabelCodec.INSTANCE.serialize(xcodeVersionConfig, out); - serializeNullable(xcodeToolchain, out, StringCodecs.asciiOptimized()); AppleBitcodeMode.CODEC.serialize(appleBitcodeMode, out); out.writeBoolNoTag(enableAppleCrosstoolTransition); out.writeBoolNoTag(targetUsesAppleCrosstool); @@ -576,7 +562,6 @@ public class AppleCommandLineOptions extends FragmentOptions { result.macosCpus = STRING_LIST_CODEC.deserialize(in); result.defaultProvisioningProfile = LabelCodec.INSTANCE.deserialize(in); result.xcodeVersionConfig = LabelCodec.INSTANCE.deserialize(in); - result.xcodeToolchain = deserializeNullable(in, StringCodecs.asciiOptimized()); result.appleBitcodeMode = AppleBitcodeMode.CODEC.deserialize(in); result.enableAppleCrosstoolTransition = in.readBool(); result.targetUsesAppleCrosstool = in.readBool(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java index 4ecab1d7e3..6370ac2ec2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleConfiguration.java @@ -87,7 +87,6 @@ public class AppleConfiguration extends BuildConfiguration.Fragment { private final Label xcodeConfigLabel; private final boolean enableAppleCrosstool; private final AppleCommandLineOptions options; - @Nullable private final String xcodeToolchain; @Nullable private final Label defaultProvisioningProfileLabel; private final boolean mandatoryMinimumVersion; private final boolean objcProviderFromLinked; @@ -116,7 +115,6 @@ public class AppleConfiguration extends BuildConfiguration.Fragment { Preconditions.checkNotNull(options.xcodeVersionConfig, "xcodeConfigLabel"); this.enableAppleCrosstool = options.enableAppleCrosstoolTransition; this.defaultProvisioningProfileLabel = options.defaultProvisioningProfile; - this.xcodeToolchain = options.xcodeToolchain; this.mandatoryMinimumVersion = options.mandatoryMinimumVersion; this.objcProviderFromLinked = options.objcProviderFromLinked; } @@ -470,18 +468,6 @@ public class AppleConfiguration extends BuildConfiguration.Fragment { return Joiner.on('-').join(components); } - /** Returns the identifier for an Xcode toolchain to use with tools. */ - @SkylarkCallable( - name = "xcode_toolchain", - doc = "Identifier for the custom Xcode toolchain to use in build, or <code>None</code> if it " - + "is not specified.", - allowReturnNones = true, - structField = true - ) - public String getXcodeToolchain() { - return xcodeToolchain; - } - /** Returns true if the minimum_os_version attribute should be mandatory on rules with linking. */ public boolean isMandatoryMinimumVersion() { return mandatoryMinimumVersion; |