commit 5020f7e400aa20e665efcc6da2751752e9004690
author cparsons <cparsons@google.com> Wed Apr 19 01:49:21 2017 +0200
committer Klaus Aehlig <aehlig@google.com> Wed Apr 19 10:49:30 2017 +0200
tree ed967643edac0d676febd4318b0e6e7ff3d2913b
parent c8ba804949b9954a8d94942fbde9c505387771c4

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

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

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 5cbb4d9..6c56907 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 @@
       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;