Remove defunct Android incremental dexing flags

RELNOTES: Remove defunct flags --experimental_incremental_dexing_for_lite_proto and --experimental_incremental_dexing_error_on_missed_jars that have long been enabled by default

PiperOrigin-RevId: 180821902

1 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
index fec5a588b4..a04ec3fd3d 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java
@@ -1449,12 +1449,11 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
       ImmutableList<Artifact> classpath,
       Map<Artifact, Artifact> dexArchives)
       throws RuleErrorException {
+    // This is a simple Iterables.transform but with useful error message in case of missed Jars.
     ImmutableList.Builder<Artifact> dexedClasspath = ImmutableList.builder();
-    boolean reportMissing =
-        AndroidCommon.getAndroidConfig(ruleContext).incrementalDexingErrorOnMissedJars();
     for (Artifact jar : classpath) {
       Artifact dexArchive = dexArchives.get(jar);
-      if (reportMissing && dexArchive == null) {
+      if (dexArchive == null) {
         // Users can create this situation by directly depending on a .jar artifact (checked in
         // or coming from a genrule or similar, b/11285003).  This will also catch new  implicit
         // dependencies that incremental dexing would need to be extended to (b/34949364).
@@ -1468,7 +1467,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory {
                 + ". If this is an implicit dependency then the rule that "
                 + "introduces it will need to be fixed to account for it correctly.");
       }
-      dexedClasspath.add(dexArchive != null ? dexArchive : jar);
+      dexedClasspath.add(dexArchive);
     }
     return dexedClasspath.build();
   }