Remove AndroidAaptVersion.

There's only one possible value for this enum.

PiperOrigin-RevId: 314149934

src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java

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 627faa1..4fb08b0 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
@@ -79,14 +79,6 @@
     }
   }
 
-  // TODO(b/142520065): Remove.
-  /** Converter for {@link AndroidAaptVersion} */
-  public static final class AndroidAaptConverter extends EnumConverter<AndroidAaptVersion> {
-    public AndroidAaptConverter() {
-      super(AndroidAaptVersion.class, "android androidAaptVersion");
-    }
-  }
-
   /**
    * Value used to avoid multiple configurations from conflicting.
    *
@@ -180,12 +172,6 @@
     DEPENDENCY;
   }
 
-  /** Types of android manifest mergers. */
-  @Deprecated
-  public enum AndroidAaptVersion {
-    AAPT2;
-  }
-
   /** Android configuration options. */
   public static class Options extends FragmentOptions {
     @Option(
@@ -614,22 +600,6 @@
                 + "before the manifests of its dependencies.")
     public ManifestMergerOrder manifestMergerOrder;
 
-    // TODO(b/142520065): Remove.
-    @Option(
-        name = "android_aapt",
-        defaultValue = "aapt2",
-        documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
-        effectTags = {
-          OptionEffectTag.AFFECTS_OUTPUTS,
-          OptionEffectTag.LOADING_AND_ANALYSIS,
-          OptionEffectTag.LOSES_INCREMENTAL_STATE,
-        },
-        converter = AndroidAaptConverter.class,
-        help =
-            "Selects the version of androidAaptVersion to use for android_binary rules."
-                + "Flag to help the test and transition to aapt2.")
-    public AndroidAaptVersion androidAaptVersion;
-
     @Option(
         name = "apk_signing_method",
         converter = ApkSigningMethodConverter.class,
@@ -926,7 +896,6 @@
       host.useWorkersWithDexbuilder = useWorkersWithDexbuilder;
       host.manifestMerger = manifestMerger;
       host.manifestMergerOrder = manifestMergerOrder;
-      host.androidAaptVersion = androidAaptVersion;
       host.allowAndroidLibraryDepsWithoutSrcs = allowAndroidLibraryDepsWithoutSrcs;
       host.oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest =
           oneVersionEnforcementUseTransitiveJarsForBinaryUnderTest;
@@ -1058,11 +1027,6 @@
     this.legacyMainDexListGenerator = options.legacyMainDexListGenerator;
     this.disableInstrumentationManifestMerging = options.disableInstrumentationManifestMerging;
 
-    if (options.androidAaptVersion != AndroidAaptVersion.AAPT2) {
-      throw new InvalidConfigurationException(
-          "--android_aapt is no longer available for setting aapt version to aapt");
-    }
-
     if (incrementalDexingShardsAfterProguard < 0) {
       throw new InvalidConfigurationException(
           "--experimental_incremental_dexing_after_proguard must be a positive number");

src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java b/src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java
index de93171..617c0f4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/MergedAndroidResources.java
@@ -17,7 +17,6 @@
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException;
 import com.google.devtools.build.lib.packages.RuleErrorConsumer;
-import com.google.devtools.build.lib.rules.android.AndroidConfiguration.AndroidAaptVersion;
 import java.util.Objects;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -166,8 +165,7 @@
    * Validates and packages this rule's resources.
    *
    * <p>See {@link ValidatedAndroidResources#validateFrom(AndroidDataContext,
-   * MergedAndroidResources, AndroidAaptVersion)}. This method is a convenience method for calling
-   * that one.
+   * MergedAndroidResources)}. This method is a convenience method for calling that one.
    */
   public ValidatedAndroidResources validate(AndroidDataContext dataContext)
       throws InterruptedException {