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