StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a237874c: fix the modtime of files in the apk when signing

Browse Source 
Merge commit 'a237874ccf49e92b93faea51f65c2ff37ea19ac7'

* commit 'a237874ccf49e92b93faea51f65c2ff37ea19ac7':
  fix the modtime of files in the apk when signing
This commit is contained in:
Doug Zongker
2009-07-15 18:15:19 -07:00
committed by Android Git Automerger
parent 3c794d71b9 a237874ccf
commit 79e4a0b568
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/signapk/SignApk.java
View File

@@ -304,9 +304,14 @@ class SignApk {
pkcs7.encodeSignedData(out); pkcs7.encodeSignedData(out);
} }
/** Copy all the files in a manifest from input to output. */ /**
* Copy all the files in a manifest from input to output. We set
* the modification times in the output to a fixed time, so as to
* reduce variation in the output file and make incremental OTAs
* more efficient.
*/
private static void copyFiles(Manifest manifest, private static void copyFiles(Manifest manifest,
JarFile in, JarOutputStream out) throws IOException { JarFile in, JarOutputStream out, long timestamp) throws IOException {
byte[] buffer = new byte[4096]; byte[] buffer = new byte[4096];
int num; int num;
@@ -315,15 +320,16 @@ class SignApk {
Collections.sort(names); Collections.sort(names);
for (String name : names) { for (String name : names) {
JarEntry inEntry = in.getJarEntry(name); JarEntry inEntry = in.getJarEntry(name);
JarEntry outEntry = null;
if (inEntry.getMethod() == JarEntry.STORED) { if (inEntry.getMethod() == JarEntry.STORED) {
// Preserve the STORED method of the input entry. // Preserve the STORED method of the input entry.
out.putNextEntry(new JarEntry(inEntry)); outEntry = new JarEntry(inEntry);
} else { } else {
// Create a new entry so that the compressed len is recomputed. // Create a new entry so that the compressed len is recomputed.
JarEntry je = new JarEntry(name); outEntry = new JarEntry(name);
je.setTime(inEntry.getTime());
out.putNextEntry(je);
} }
outEntry.setTime(timestamp);
out.putNextEntry(outEntry);
InputStream data = in.getInputStream(inEntry); InputStream data = in.getInputStream(inEntry);
while ((num = data.read(buffer)) > 0) { while ((num = data.read(buffer)) > 0) {
@@ -380,7 +386,7 @@ class SignApk {
writeSignatureBlock(signature, publicKey, outputJar); writeSignatureBlock(signature, publicKey, outputJar);
// Everything else // Everything else
copyFiles(manifest, inputJar, outputJar); copyFiles(manifest, inputJar, outputJar, timestamp);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
System.exit(1); System.exit(1);