diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 17 |
1 files changed, 2 insertions, 15 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; |