diff options
author | cparsons <cparsons@google.com> | 2017-04-19 01:49:21 +0200 |
---|---|---|
committer | Klaus Aehlig <aehlig@google.com> | 2017-04-19 10:49:30 +0200 |
commit | 5020f7e400aa20e665efcc6da2751752e9004690 (patch) | |
tree | ed967643edac0d676febd4318b0e6e7ff3d2913b /src/main/java | |
parent | c8ba804949b9954a8d94942fbde9c505387771c4 (diff) |
Temporarily disable consistent split transitioning on apple_binary rules.
If minimum_os is unspecified on an apple_binary target and ios_multi_cpus is not set, no
apple_binary configuration transition is made.
RELNOTES: None.
PiperOrigin-RevId: 153529598
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java index 5cbb4d98ed..6c56907e69 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java @@ -165,7 +165,9 @@ public class MultiArchSplitTransitionProvider implements SplitTransitionProvider switch (platformType) { case IOS: cpus = buildOptions.get(AppleCommandLineOptions.class).iosMultiCpus; - if (cpus.isEmpty()) { + // TODO(b/37463474): Temporary workaround to prevent a split transition with default + // flag values: Don't transition unless minimum_os or ios_multi_versions are specified! + if (cpus.isEmpty() && minimumOsVersion.isPresent()) { cpus = ImmutableList.of(buildOptions.get(AppleCommandLineOptions.class).iosCpu); } configurationDistinguisher = ConfigurationDistinguisher.APPLEBIN_IOS; |