Force incremental_dexing_after_proguard_by_default to True so we can delete the flag in a follow up cl

PiperOrigin-RevId: 879171277
Change-Id: Iace2eedbf9f20b1eaf7228db012f98c06c07614d

rules/android_binary/impl.bzl

diff --git a/rules/android_binary/impl.bzl b/rules/android_binary/impl.bzl
index 53f155c..0d7caf2 100644
--- a/rules/android_binary/impl.bzl
+++ b/rules/android_binary/impl.bzl
@@ -315,7 +315,6 @@
         force_incremental_dexing = ctx.attr.incremental_dexing,
         has_forbidden_dexopts = len([d for d in ctx.attr.dexopts if d in forbidden_dexopts]) > 0,
         is_binary_optimized = is_binary_optimized,
-        incremental_dexing_after_proguard_by_default = ctx.fragments.android.incremental_dexing_after_proguard_by_default,
         incremental_dexing_shards_after_proguard = ctx.fragments.android.incremental_dexing_shards_after_proguard,
     )
 

rules/dex.bzl

diff --git a/rules/dex.bzl b/rules/dex.bzl
index d7f55a9..796e7a4 100644
--- a/rules/dex.bzl
+++ b/rules/dex.bzl
@@ -498,7 +498,6 @@
 def _get_effective_incremental_dexing(
         force_incremental_dexing = _tristate.auto,
         has_forbidden_dexopts = False,
-        incremental_dexing_after_proguard_by_default = True,
         incremental_dexing_shards_after_proguard = True,
         is_binary_optimized = False):
     if (is_binary_optimized and
@@ -513,7 +512,7 @@
 
     # If there are incompatible dexopts and the incremental_dexing attr is not set, we silently don't run
     # incremental dexing.
-    if has_forbidden_dexopts or (is_binary_optimized and not incremental_dexing_after_proguard_by_default):
+    if has_forbidden_dexopts:
         return False
 
     return True