The Android transition requires a valid CPU value. If we don't have one, don't do the split.

RELNOTES: Disable the Android split transition if --android_cpu and fat_apk_cpu are both empty.

--
MOS_MIGRATED_REVID=129931354

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index 0212ba2884..4bcb967363 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -221,7 +221,8 @@ public final class AndroidRuleClasses {
           Label androidCrosstoolTop = androidOptions.androidCrosstoolTop;
           if (androidOptions.fatApkCpus.isEmpty()
               && (androidCrosstoolTop == null
-                  || androidCrosstoolTop.equals(cppOptions.crosstoolTop))) {
+                  || androidCrosstoolTop.equals(cppOptions.crosstoolTop)
+                  || androidOptions.cpu.isEmpty())) {
             return ImmutableList.of();
           }