Merge "Command-line flag to disable signing with APK Signature Scheme v2."

This commit is contained in:
Alex Klyubin
2016-01-20 21:02:29 +00:00
committed by Gerrit Code Review

View File

@@ -899,6 +899,8 @@ class SignApk {
System.err.println("Usage: signapk [-w] " + System.err.println("Usage: signapk [-w] " +
"[-a <alignment>] " + "[-a <alignment>] " +
"[-providerClass <className>] " + "[-providerClass <className>] " +
"[--min-sdk-version <n>] " +
"[--disable-v2] " +
"publickey.x509[.pem] privatekey.pk8 " + "publickey.x509[.pem] privatekey.pk8 " +
"[publickey2.x509[.pem] privatekey2.pk8 ...] " + "[publickey2.x509[.pem] privatekey2.pk8 ...] " +
"input.jar output.jar"); "input.jar output.jar");
@@ -941,9 +943,11 @@ class SignApk {
minSdkVersion = Integer.parseInt(minSdkVersionString); minSdkVersion = Integer.parseInt(minSdkVersionString);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"min-sdk-version must be a decimal number: " + minSdkVersionString); "--min-sdk-version must be a decimal number: " + minSdkVersionString);
} }
++argstart; ++argstart;
} else if ("--disable-v2".equals(args[argstart])) {
++argstart;
} else { } else {
usage(); usage();
} }