Remove decoupling flag from Bazel

This flag is turned on everywhere. Remove it.

There's a lot of dead code hidden behing this flag; will remove it in a series
of upcoming changes.

RELNOTES: none
PiperOrigin-RevId: 207732126

1 files changed, 2 insertions, 18 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 752b8cf1b1..98ec4dafde 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
@@ -816,19 +816,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
     public AndroidRobolectricTestDeprecationLevel robolectricTestDeprecationLevel;
 
     @Option(
-        name = "android_decouple_data_processing",
-        defaultValue = "true",
-        documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
-        effectTags = {
-          OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION,
-          OptionEffectTag.ACTION_COMMAND_LINES
-        },
-        help =
-            "If true, Android data (assets, resources, and manifests) will be processed seperately "
-                + "when possible. Otherwise, they will all be processed together.")
-    public boolean decoupleDataProcessing;
-
-    @Option(
       name = "android_migration_tag_check",
       defaultValue = "false",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
@@ -933,7 +920,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
   private final boolean skipParsingAction;
   private final boolean fixedResourceNeverlinking;
   private final AndroidRobolectricTestDeprecationLevel robolectricTestDeprecationLevel;
-  private final boolean decoupleDataProcessing;
   private final boolean checkForMigrationTag;
   private final boolean oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
   private final boolean dataBindingV2;
@@ -974,7 +960,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
     this.skipParsingAction = options.skipParsingAction;
     this.fixedResourceNeverlinking = options.fixedResourceNeverlinking;
     this.robolectricTestDeprecationLevel = options.robolectricTestDeprecationLevel;
-    this.decoupleDataProcessing = options.decoupleDataProcessing;
     this.checkForMigrationTag = options.checkForMigrationTag;
     this.oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest =
         options.oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
@@ -1029,7 +1014,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
       boolean skipParsingAction,
       boolean fixedResourceNeverlinking,
       AndroidRobolectricTestDeprecationLevel robolectricTestDeprecationLevel,
-      boolean decoupleDataProcessing,
       boolean checkForMigrationTag,
       boolean oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest,
       boolean dataBindingV2) {
@@ -1065,7 +1049,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
     this.skipParsingAction = skipParsingAction;
     this.fixedResourceNeverlinking = fixedResourceNeverlinking;
     this.robolectricTestDeprecationLevel = robolectricTestDeprecationLevel;
-    this.decoupleDataProcessing = decoupleDataProcessing;
     this.checkForMigrationTag = checkForMigrationTag;
     this.oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest =
         oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
@@ -1218,7 +1201,8 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment
   }
 
   public boolean decoupleDataProcessing() {
-    return decoupleDataProcessing;
+    // TODO(b/76418450): Entirely remove this method and code that depends on it
+    return true;
   }
 
   public boolean checkForMigrationTag() {