Merge "signapk: --align-file-size flag" (da7ca70c) · Commits · e / os / android_build

tools/releasetools/apex_utils.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -370,7 +370,7 @@ def SignUncompressedApex(avbtool, apex_file, payload_key, container_key,

	# Specify the 4K alignment when calling SignApk.		# Specify the 4K alignment when calling SignApk.
	extra_signapk_args = OPTIONS.extra_signapk_args[:]		extra_signapk_args = OPTIONS.extra_signapk_args[:]
	extra_signapk_args.extend(['-a', '4096'])		extra_signapk_args.extend(['-a', '4096', '--align-file-size'])

	password = container_pw.get(container_key) if container_pw else None		password = container_pw.get(container_key) if container_pw else None
	common.SignFile(		common.SignFile(

tools/signapk/src/com/android/signapk/SignApk.java

+49 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1020,6 +1020,7 @@ class SignApk {
	private static void usage() {		private static void usage() {
	System.err.println("Usage: signapk [-w] " +		System.err.println("Usage: signapk [-w] " +
	"[-a <alignment>] " +		"[-a <alignment>] " +
			"[--align-file-size] " +
	"[-providerClass <className>] " +		"[-providerClass <className>] " +
	"[--min-sdk-version <n>] " +		"[--min-sdk-version <n>] " +
	"[--disable-v2] " +		"[--disable-v2] " +
	@@ -1044,6 +1045,7 @@ class SignApk {
	boolean signWholeFile = false;		boolean signWholeFile = false;
	String providerClass = null;		String providerClass = null;
	int alignment = 4;		int alignment = 4;
			boolean alignFileSize = false;
	Integer minSdkVersionOverride = null;		Integer minSdkVersionOverride = null;
	boolean signUsingApkSignatureSchemeV2 = true;		boolean signUsingApkSignatureSchemeV2 = true;
	boolean signUsingApkSignatureSchemeV4 = false;		boolean signUsingApkSignatureSchemeV4 = false;
	@@ -1063,6 +1065,9 @@ class SignApk {
	} else if ("-a".equals(args[argstart])) {		} else if ("-a".equals(args[argstart])) {
	alignment = Integer.parseInt(args[++argstart]);		alignment = Integer.parseInt(args[++argstart]);
	++argstart;		++argstart;
			} else if ("--align-file-size".equals(args[argstart])) {
			alignFileSize = true;
			++argstart;
	} else if ("--min-sdk-version".equals(args[argstart])) {		} else if ("--min-sdk-version".equals(args[argstart])) {
	String minSdkVersionString = args[++argstart];		String minSdkVersionString = args[++argstart];
	try {		try {
	@@ -1206,12 +1211,22 @@ class SignApk {
	ByteBuffer[] outputChunks = new ByteBuffer[] {v1SignedApk};		ByteBuffer[] outputChunks = new ByteBuffer[] {v1SignedApk};

	ZipSections zipSections = findMainZipSections(v1SignedApk);		ZipSections zipSections = findMainZipSections(v1SignedApk);

			ByteBuffer eocd = ByteBuffer.allocate(zipSections.eocd.remaining());
			eocd.put(zipSections.eocd);
			eocd.flip();
			eocd.order(ByteOrder.LITTLE_ENDIAN);
			// This loop is supposed to be iterated twice at most.
			// The second pass is to align the file size after amending EOCD comments
			// with assumption that re-generated signing block would be the same size.
			while (true) {
	ApkSignerEngine.OutputApkSigningBlockRequest2 addV2SignatureRequest =		ApkSignerEngine.OutputApkSigningBlockRequest2 addV2SignatureRequest =
	apkSigner.outputZipSections2(		apkSigner.outputZipSections2(
	DataSources.asDataSource(zipSections.beforeCentralDir),		DataSources.asDataSource(zipSections.beforeCentralDir),
	DataSources.asDataSource(zipSections.centralDir),		DataSources.asDataSource(zipSections.centralDir),
	DataSources.asDataSource(zipSections.eocd));		DataSources.asDataSource(eocd));
	if (addV2SignatureRequest != null) {		if (addV2SignatureRequest == null) break;

	// Need to insert the returned APK Signing Block before ZIP Central		// Need to insert the returned APK Signing Block before ZIP Central
	// Directory.		// Directory.
	int padding = addV2SignatureRequest.getPaddingSizeBeforeApkSigningBlock();		int padding = addV2SignatureRequest.getPaddingSizeBeforeApkSigningBlock();
	@@ -1219,8 +1234,8 @@ class SignApk {
	// Because the APK Signing Block is inserted before the Central Directory,		// Because the APK Signing Block is inserted before the Central Directory,
	// we need to adjust accordingly the offset of Central Directory inside the		// we need to adjust accordingly the offset of Central Directory inside the
	// ZIP End of Central Directory (EoCD) record.		// ZIP End of Central Directory (EoCD) record.
	ByteBuffer modifiedEocd = ByteBuffer.allocate(zipSections.eocd.remaining());		ByteBuffer modifiedEocd = ByteBuffer.allocate(eocd.remaining());
	modifiedEocd.put(zipSections.eocd);		modifiedEocd.put(eocd);
	modifiedEocd.flip();		modifiedEocd.flip();
	modifiedEocd.order(ByteOrder.LITTLE_ENDIAN);		modifiedEocd.order(ByteOrder.LITTLE_ENDIAN);
	ApkUtils.setZipEocdCentralDirectoryOffset(		ApkUtils.setZipEocdCentralDirectoryOffset(
	@@ -1235,6 +1250,32 @@ class SignApk {
	zipSections.centralDir,		zipSections.centralDir,
	modifiedEocd};		modifiedEocd};
	addV2SignatureRequest.done();		addV2SignatureRequest.done();

			// Exit the loop if we don't need to align the file size
			if (!alignFileSize \|\| alignment < 2) {
			break;
			}

			// Calculate the file size
			eocd = modifiedEocd;
			int fileSize = 0;
			for (ByteBuffer buf : outputChunks) {
			fileSize += buf.remaining();
			}
			// Exit the loop because the file size is aligned.
			if (fileSize % alignment == 0) {
			break;
			}
			// Pad EOCD comment to align the file size.
			int commentLen = alignment - fileSize % alignment;
			modifiedEocd = ByteBuffer.allocate(eocd.remaining() + commentLen);
			modifiedEocd.put(eocd);
			modifiedEocd.rewind();
			modifiedEocd.order(ByteOrder.LITTLE_ENDIAN);
			ApkUtils.updateZipEocdCommentLen(modifiedEocd);
			// Since V2 signing block should cover modified EOCD,
			// re-iterate the loop with modified EOCD.
			eocd = modifiedEocd;
	}		}

	// This assumes outputChunks are array-backed. To avoid this assumption, the		// This assumes outputChunks are array-backed. To avoid this assumption, the