diff options
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java | 2 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java | 3 |
2 files changed, 3 insertions, 2 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 b4910732c7..6e94e00632 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 @@ -424,7 +424,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "experimental_incremental_dexing_after_proguard", - defaultValue = "0", + defaultValue = "1", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.LOSES_INCREMENTAL_STATE}, help = diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java index 2e88c80e13..25755bff87 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidBinaryTest.java @@ -635,7 +635,8 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase { } @Test - public void testIncrementalDexing_attributeIncompatibleWithProguard() throws Exception { + public void testIncrementalDexing_incompatibleWithProguardWhenDisabled() throws Exception { + useConfiguration("--experimental_incremental_dexing_after_proguard=0"); // disable with Proguard checkError("java/com/google/android", "top", "target cannot be incrementally dexed", "android_binary(", " name = 'top',", |