Switch default --apk_signing_method from legacy_v1 to v1.

Also makes apksigner a mandatory attribute of android_sdk. Now Android builds will default to using the Apk Signer tool to sign APKs. A followup changelist will remove the legacy code path.

RELNOTES: --apk_signing_method default changed to v1. Android APKs are now signed with the new ApkSignerTool by default.

--
MOS_MIGRATED_REVID=137433061

1 files changed, 1 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java
index da82a92d45..5877181e27 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java
@@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.TransitiveInfoCollection;
 import com.google.devtools.build.lib.analysis.TransitiveInfoProvider;
 import com.google.devtools.build.lib.collect.nestedset.NestedSet;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-import javax.annotation.Nullable;
 
 /** Description of the tools Blaze needs from an Android SDK. */
 @AutoValue
@@ -45,7 +44,7 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider {
       FilesToRunProvider aidl,
       FilesToRunProvider aapt,
       FilesToRunProvider apkBuilder,
-      @Nullable FilesToRunProvider apkSigner,
+      FilesToRunProvider apkSigner,
       FilesToRunProvider proguard,
       FilesToRunProvider zipalign,
       FilesToRunProvider jack,
@@ -141,7 +140,6 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider {
 
   public abstract FilesToRunProvider getApkBuilder();
 
-  @Nullable
   public abstract FilesToRunProvider getApkSigner();
 
   public abstract FilesToRunProvider getProguard();