add flag to use incremental dexing by default for proguarded android binaries

RELNOTES: None.

PiperOrigin-RevId: 186067158

1 files changed, 4 insertions, 4 deletions

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 1a7cec0813..694747bcc5 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
@@ -685,8 +685,9 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
   }
 
   @Test
-  public void testIncrementalDexingAfterProguard_autoShardedMultidex() throws Exception {
-    useConfiguration("--experimental_incremental_dexing_after_proguard=3");
+  public void testIncrementalDexingAfterProguard_autoShardedMultidexAutoOptIn() throws Exception {
+    useConfiguration("--experimental_incremental_dexing_after_proguard=3",
+        "--experimental_incremental_dexing_after_proguard_by_default");
     // Use "legacy" multidex mode so we get a main dex list file and can test that it's passed to
     // the splitter action (similar to _withDexShards below), unlike without the dex splitter where
     // the main dex list goes to the merging action.
@@ -696,11 +697,10 @@ public class AndroidBinaryTest extends AndroidBuildViewTestCase {
         "  name = 'top',",
         "  srcs = ['foo.java', 'bar.srcjar'],",
         "  manifest = 'AndroidManifest.xml',",
-        "  incremental_dexing = 1,",
         "  multidex = 'legacy',",
         "  dexopts = ['--minimal-main-dex', '--positions=none'],",
         "  proguard_specs = ['b.pro'],",
-        ")");
+        ")"); // incremental_dexing = 1 attribute not needed
 
     ConfiguredTarget topTarget = getConfiguredTarget("//java/com/google/android:top");
     assertNoEvents();