p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "[signapk] new flag to request v4 signing" into rvc-dev

This commit is contained in:
Songchun Fan 2020-03-26 17:48:19 +00:00 committed by Android (Google) Code Review
parent 0d40e21e8d ce42b253b7
commit dbe0ab56f3
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/signapk/src/com/android/signapk/SignApk.java
View File

@ -40,6 +40,7 @@ import com.android.apksig.Hints;
import com.android.apksig.apk.ApkUtils; import com.android.apksig.apk.ApkUtils;
import com.android.apksig.apk.MinSdkVersionException; import com.android.apksig.apk.MinSdkVersionException;
import com.android.apksig.util.DataSink; import com.android.apksig.util.DataSink;
import com.android.apksig.util.DataSource;
import com.android.apksig.util.DataSources; import com.android.apksig.util.DataSources;
import com.android.apksig.zip.ZipFormatException; import com.android.apksig.zip.ZipFormatException;
@ -56,6 +57,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.RandomAccessFile;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.ByteOrder; import java.nio.ByteOrder;
@ -1020,9 +1022,10 @@ class SignApk {
"[-providerClass <className>] " + "[-providerClass <className>] " +
"[--min-sdk-version <n>] " + "[--min-sdk-version <n>] " +
"[--disable-v2] " + "[--disable-v2] " +
"[--enable-v4] " +
"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 [output-v4-file]");
System.exit(2); System.exit(2);
} }
@ -1042,6 +1045,7 @@ class SignApk {
int alignment = 4; int alignment = 4;
Integer minSdkVersionOverride = null; Integer minSdkVersionOverride = null;
boolean signUsingApkSignatureSchemeV2 = true; boolean signUsingApkSignatureSchemeV2 = true;
boolean signUsingApkSignatureSchemeV4 = false;
int argstart = 0; int argstart = 0;
while (argstart < args.length && args[argstart].startsWith("-")) { while (argstart < args.length && args[argstart].startsWith("-")) {
@ -1069,13 +1073,22 @@ class SignApk {
} else if ("--disable-v2".equals(args[argstart])) { } else if ("--disable-v2".equals(args[argstart])) {
signUsingApkSignatureSchemeV2 = false; signUsingApkSignatureSchemeV2 = false;
++argstart; ++argstart;
} else if ("--enable-v4".equals(args[argstart])) {
signUsingApkSignatureSchemeV4 = true;
++argstart;
} else { } else {
usage(); usage();
} }
} }
if ((args.length - argstart) % 2 == 1) usage(); int numArgsExcludeV4FilePath;
int numKeys = ((args.length - argstart) / 2) - 1; if (signUsingApkSignatureSchemeV4) {
numArgsExcludeV4FilePath = args.length - 1;
} else {
numArgsExcludeV4FilePath = args.length;
}
if ((numArgsExcludeV4FilePath - argstart) % 2 == 1) usage();
int numKeys = ((numArgsExcludeV4FilePath - argstart) / 2) - 1;
if (signWholeFile && numKeys > 1) { if (signWholeFile && numKeys > 1) {
System.err.println("Only one key may be used with -w."); System.err.println("Only one key may be used with -w.");
System.exit(2); System.exit(2);
@ -1083,8 +1096,12 @@ class SignApk {
loadProviderIfNecessary(providerClass); loadProviderIfNecessary(providerClass);
String inputFilename = args[args.length-2]; String inputFilename = args[numArgsExcludeV4FilePath - 2];
String outputFilename = args[args.length-1]; String outputFilename = args[numArgsExcludeV4FilePath - 1];
String outputV4Filename = "";
if (signUsingApkSignatureSchemeV4) {
outputV4Filename = args[args.length - 1];
}
JarFile inputJar = null; JarFile inputJar = null;
FileOutputStream outputFile = null; FileOutputStream outputFile = null;
@ -1221,6 +1238,13 @@ class SignApk {
outputFile.close(); outputFile.close();
outputFile = null; outputFile = null;
apkSigner.outputDone(); apkSigner.outputDone();
if (signUsingApkSignatureSchemeV4) {
final DataSource outputApkIn = DataSources.asDataSource(
new RandomAccessFile(new File(outputFilename), "r"));
final File outputV4File = new File(outputV4Filename);
apkSigner.signV4(outputApkIn, outputV4File, false /* ignore failures */);
}
} }
return; return;