Remove support for --apk_signing_method=legacy_v1.

The default has been v1 since late October.

--
PiperOrigin-RevId: 150250180
MOS_MIGRATED_REVID=150250180

1 files changed, 8 insertions, 24 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java
index 216713fced..c552a5f94c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ApkActionsBuilder.java
@@ -148,31 +148,15 @@ public class ApkActionsBuilder {
     }
 
     if (signedApk != null) {
-      if (signingMethod.signLegacy()) {
-        // With the legacy signer, zipalignment is performed after signing. So if a zipaligned APK
-        // is requested, we need an intermediate signed-but-not-zipaligned apk artifact.
-        Artifact intermediateSignedApk = zipalignApk
-            ? AndroidBinary.getDxArtifact(ruleContext, "signed_" + signedApk.getFilename())
-            : signedApk;
-        legacyBuildApk(
-            ruleContext,
-            intermediateSignedApk,
-            semantics.getApkDebugSigningKey(ruleContext),
-            "Generating signed " + apkName);
-        if (zipalignApk) {
-          zipalignApk(ruleContext, intermediateSignedApk, signedApk);
-        }
-      } else {
-        Artifact apkToSign = intermediateUnsignedApk;
-        // With apksigner, zipalignment is performed before signing. So if a zipaligned APK is
-        // requested, we need an intermediate zipaligned-but-not-signed apk artifact.
-        if (zipalignApk) {
-          apkToSign =
-              AndroidBinary.getDxArtifact(ruleContext, "zipaligned_" + signedApk.getFilename());
-          zipalignApk(ruleContext, intermediateUnsignedApk, apkToSign);
-        }
-        signApk(ruleContext, semantics.getApkDebugSigningKey(ruleContext), apkToSign, signedApk);
+      Artifact apkToSign = intermediateUnsignedApk;
+      // Zipalignment is performed before signing. So if a zipaligned APK is requested, we need an
+      // intermediate zipaligned-but-not-signed apk artifact.
+      if (zipalignApk) {
+        apkToSign =
+            AndroidBinary.getDxArtifact(ruleContext, "zipaligned_" + signedApk.getFilename());
+        zipalignApk(ruleContext, intermediateUnsignedApk, apkToSign);
       }
+      signApk(ruleContext, semantics.getApkDebugSigningKey(ruleContext), apkToSign, signedApk);
     }
   }