diff options
| author |  cparsons <cparsons@google.com> | 2017-04-28 21:32:46 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-04-30 23:11:53 +0200 |
| commit | 067bf92b6fab31cfbe141a9063fcf573a8348cc6 (patch) | |
| tree | 5c926e6fbbdea29649be38b7ada8945428f8ba7b /src/main/java/com/google/devtools | |
| parent | 3eeb660ef4a7d175669995ba8139218b052b3b51 (diff) | |
Split transition unconditionally for multiarch apple rules
RELNOTES: None.
PiperOrigin-RevId: 154569551
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/MultiArchSplitTransitionProvider.java | 6 |
1 files changed, 1 insertions, 5 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 e2f1d50888..9e8b28e0ce 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 @@ -174,11 +174,7 @@ public class MultiArchSplitTransitionProvider implements SplitTransitionProvider 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 is_extension is specified! - if (minimumOsVersion.isPresent() || isExtension) { - cpus = ImmutableList.of(buildOptions.get(AppleCommandLineOptions.class).iosCpu); - } + cpus = ImmutableList.of(buildOptions.get(AppleCommandLineOptions.class).iosCpu); } configurationDistinguisher = isExtension ? ConfigurationDistinguisher.APPLEBIN_IOS_EXT |