Set --fat_apk_cpu=armeabi-v7a by default and remove Constants.ANDROID_DEFAULT_FAT_APK_CPUS.

--
MOS_MIGRATED_REVID=118675987

2 files changed, 5 insertions, 18 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
index 4c2a7d44c2..551aa5d1ba 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java
@@ -35,7 +35,6 @@ import com.google.devtools.build.lib.packages.Attribute.SplitTransition;
 import com.google.devtools.common.options.Converters;
 import com.google.devtools.common.options.EnumConverter;
 import com.google.devtools.common.options.Option;
-
 import java.util.List;
 
 /**
@@ -180,8 +179,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     // TODO(bazel-team): Maybe merge this with --android_cpu above.
     @Option(name = "fat_apk_cpu",
             converter = Converters.CommaSeparatedOptionListConverter.class,
-            allowMultiple = true,
-            defaultValue = "",
+            defaultValue = "armeabi-v7a",
             category = "undocumented",
             help = "Setting this option enables fat APKs, which contain native binaries for all "
                 + "specified target architectures, e.g., --fat_apk_cpu=x86,armeabi-v7a. Note that "
@@ -253,17 +251,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
       return host;
     }
 
-    // This method is here because Constants.ANDROID_DEFAULT_FAT_APK_CPUS cannot be a constant
-    // because we replace the class file in the .jar after compilation. However, that means that we
-    // cannot use it as an attribute value in an annotation.
-    public List<String> realFatApkCpus() {
-      if (fatApkCpus.isEmpty()) {
-        return Constants.ANDROID_DEFAULT_FAT_APK_CPUS;
-      } else {
-        return fatApkCpus;
-      }
-    }
-
     @Override
     public ImmutableList<String> getDefaultsRules() {
       return ImmutableList.of("android_tools_defaults_jar(name = 'android_jar')");
@@ -316,7 +303,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment {
     this.strictDeps = options.strictDeps;
     this.legacyNativeSupport = options.legacyNativeSupport;
     this.cpu = options.cpu;
-    this.fatApk = !options.realFatApkCpus().isEmpty();
+    this.fatApk = !options.fatApkCpus.isEmpty();
     this.configurationDistinguisher = options.configurationDistinguisher;
     this.useJackForDexing = options.useJackForDexing;
     this.jackSanityChecks = options.jackSanityChecks;
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 1b964d9d12..e0f7a61783 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
@@ -208,20 +208,20 @@ public final class AndroidRuleClasses {
               buildOptions.get(AndroidConfiguration.Options.class);
           CppOptions cppOptions = buildOptions.get(CppOptions.class);
           Label androidCrosstoolTop = androidOptions.androidCrosstoolTop;
-          if (androidOptions.realFatApkCpus().isEmpty()
+          if (androidOptions.fatApkCpus.isEmpty()
               && (androidCrosstoolTop == null
                   || androidCrosstoolTop.equals(cppOptions.crosstoolTop))) {
             return ImmutableList.of();
           }
 
-          if (androidOptions.realFatApkCpus().isEmpty()) {
+          if (androidOptions.fatApkCpus.isEmpty()) {
             BuildOptions splitOptions = buildOptions.clone();
             setCrosstoolToAndroid(splitOptions, buildOptions);
             return ImmutableList.of(splitOptions);
           }
 
           List<BuildOptions> result = new ArrayList<>();
-          for (String cpu : ImmutableSortedSet.copyOf(androidOptions.realFatApkCpus())) {
+          for (String cpu : ImmutableSortedSet.copyOf(androidOptions.fatApkCpus)) {
             BuildOptions splitOptions = buildOptions.clone();
             // Disable fat APKs for the child configurations.
             splitOptions.get(AndroidConfiguration.Options.class).fatApkCpus = ImmutableList.of();