diff options
author | Chris Parsons <cparsons@google.com> | 2016-05-11 10:01:14 +0000 |
---|---|---|
committer | Klaus Aehlig <aehlig@google.com> | 2016-05-11 10:25:28 +0000 |
commit | 5d80fddc70d43cb0051d2774cf7d5b1bcfa92439 (patch) | |
tree | 77eb273a5800918ef8d53e1168ea5028a9da0c2e /src/main/java/com/google/devtools/build/lib/rules/objc/IosExtension.java | |
parent | 4caa04f007f77f367c857e365ca8c3d6621c4940 (diff) |
Refactor ios_split_cpu to be apple_split_cpu, in preparation for using it to specify platform mutli_cpu splits other than on ios_multi_cpu (such as a split on watchos)
No users should be manually specifying this flag, so this shouldn't break anyone...
--
MOS_MIGRATED_REVID=122037152
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/IosExtension.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/IosExtension.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtension.java b/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtension.java index 4471e6bdab..f4435d4a0f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtension.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/IosExtension.java @@ -24,6 +24,7 @@ import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.config.BuildOptions; import com.google.devtools.build.lib.packages.Attribute.SplitTransition; +import com.google.devtools.build.lib.rules.apple.AppleCommandLineOptions; import com.google.devtools.build.lib.rules.apple.AppleConfiguration.ConfigurationDistinguisher; import com.google.devtools.build.lib.rules.apple.DottedVersion; import com.google.devtools.build.lib.rules.objc.ReleaseBundlingSupport.SplitArchTransition; @@ -119,7 +120,7 @@ public class IosExtension extends ReleaseBundlingTargetFactory { BuildOptions splitOptions = originalOptions.clone(); setMinimumOsVersion(splitOptions, newMinimumVersion); - splitOptions.get(ObjcCommandLineOptions.class).configurationDistinguisher = + splitOptions.get(AppleCommandLineOptions.class).configurationDistinguisher = getConfigurationDistinguisher(); return ImmutableList.of(splitOptions); } |