Remove --use_single_jar_apk_builder. It's been a no-op for years.

RELNOTES: --use_single_jar_apk_builder is removed. It's been a no-op for years. PiperOrigin-RevId: 560190309 Change-Id: I96ffe47054aad264a12321a9b17d9fa27b880eee
bazelbuild · Aug 25, 2023 · 669c8aa · 669c8aa
1 parent 252d363
commit 669c8aa
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 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
@@ -660,15 +660,6 @@ public static class Options extends FragmentOptions {
         help = "Implementation to use to sign APKs")
     public ApkSigningMethod apkSigningMethod;
 
-    // TODO(b/36023617): Remove this option.
-    @Option(
-        name = "use_singlejar_apkbuilder",
-        defaultValue = "true",
-        documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION,
-        effectTags = OptionEffectTag.LOADING_AND_ANALYSIS,
-        help = "This option is a deprecated. It is now a no-op and will be removed soon.")
-    public boolean useSingleJarApkBuilder;
-
     @Option(
         name = "experimental_android_compress_java_resources",
         defaultValue = "false",
@@ -1176,7 +1167,6 @@ public FragmentOptions getExec() {
   private final AndroidManifestMerger manifestMerger;
   private final ManifestMergerOrder manifestMergerOrder;
   private final ApkSigningMethod apkSigningMethod;
-  private final boolean useSingleJarApkBuilder;
   private final boolean compressJavaResources;
   private final boolean exportsManifestDefault;
   private final boolean useParallelDex2Oat;
@@ -1231,7 +1221,6 @@ public AndroidConfiguration(BuildOptions buildOptions) throws InvalidConfigurati
     this.manifestMerger = options.manifestMerger;
     this.manifestMergerOrder = options.manifestMergerOrder;
     this.apkSigningMethod = options.apkSigningMethod;
-    this.useSingleJarApkBuilder = options.useSingleJarApkBuilder;
     this.useRexToCompressDexFiles = options.useRexToCompressDexFiles;
     this.compressJavaResources = options.compressJavaResources;
     this.exportsManifestDefault = options.exportsManifestDefault;
@@ -1428,11 +1417,6 @@ public Boolean apkSigningMethodV4() {
     return apkSigningMethod.signV4();
   }
 
-  @Override
-  public boolean useSingleJarApkBuilder() {
-    return useSingleJarApkBuilder;
-  }
-
   @Override
   public boolean useParallelDex2Oat() {
     return useParallelDex2Oat;

diff --git a/.../java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidConfigurationApi.java b/.../java/com/google/devtools/build/lib/starlarkbuildapi/android/AndroidConfigurationApi.java
@@ -152,13 +152,6 @@ public interface AndroidConfigurationApi extends StarlarkValue {
       documented = false)
   boolean useAndroidResourceNameObfuscation();
 
-  @StarlarkMethod(
-      name = "use_single_jar_apk_builder",
-      structField = true,
-      doc = "",
-      documented = false)
-  boolean useSingleJarApkBuilder();
-
   @StarlarkMethod(name = "use_parallel_dex2oat", structField = true, doc = "", documented = false)
   boolean useParallelDex2Oat();