From 3d5faa4eca6b1e47e08b5b4db26a524b85ab8e13 Mon Sep 17 00:00:00 2001 From: ajmichael Date: Mon, 30 Oct 2017 15:22:32 -0400 Subject: Remove --incremental_dexing_binary_types. It has been set to all for a bit now. It is not in any teams blazerc/tap configs. RELNOTES: --incremental_dexing_binary_types has been removed. All builds are supported by incremental dexing (modulo proguard and some blacklisted dx flags). PiperOrigin-RevId: 173931117 --- .../com/google/devtools/build/lib/rules/android/DexArchiveAspect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java index 2970d86d7b..9dd84bb0f6 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java @@ -172,8 +172,8 @@ public final class DexArchiveAspect extends NativeAspectClass implements Configu TriState incrementalAttr = TriState.valueOf(params.getOnlyValueOfAttribute("incremental_dexing")); if (incrementalAttr == TriState.NO - || (getAndroidConfig(ruleContext).getIncrementalDexingBinaries().isEmpty() - && incrementalAttr != TriState.YES)) { + || (!getAndroidConfig(ruleContext).useIncrementalDexing() + && incrementalAttr == TriState.AUTO)) { // Dex archives will never be used, so don't bother setting them up. return result.build(); } -- cgit v1.2.3