diff options
| author |  ajmichael <ajmichael@google.com> | 2017-10-30 15:22:32 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-10-31 10:37:32 -0400 |
| commit | 3d5faa4eca6b1e47e08b5b4db26a524b85ab8e13 (patch) | |
| tree | f1664fcc61bdf15eb41dc10bb081b50361982f42 /src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java | |
| parent | ac94fea7dd2f0ba7bc1ddb3875a71ba5f3ca8cb0 (diff) | |
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
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } |