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

am 2479a098: am 30b5ed7b: Merge "Fix zipalign README file and usage strings."

Browse Source 
* commit '2479a0987da03f0059c42991bf59e3b32551e107':
  Fix zipalign README file and usage strings.
This commit is contained in:
Narayan Kamath
2015-02-27 17:35:57 +00:00
committed by Android Git Automerger
parent 41d35af217 2479a0987d
commit de979a0205
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/zipalign/README.txt
View File

@@ -5,6 +5,7 @@ usage: zipalign [-f] [-v] <align> infile.zip outfile.zip
-c : check alignment only (does not modify file) -c : check alignment only (does not modify file)
-f : overwrite existing outfile.zip -f : overwrite existing outfile.zip
-p : page align stored shared object files
-v : verbose output -v : verbose output
<align> is in bytes, e.g. "4" provides 32-bit alignment <align> is in bytes, e.g. "4" provides 32-bit alignment
infile.zip is an existing Zip archive infile.zip is an existing Zip archive
@@ -33,3 +34,7 @@ By default, zipalign will not overwrite an existing output file. With the
You can use the "-c" flag to test whether a zip archive is properly aligned. You can use the "-c" flag to test whether a zip archive is properly aligned.
The "-p" flag aligns any file with a ".so" extension, and which is stored
uncompressed in the zip archive, to a 4096-byte page boundary. This
facilitates directly loading shared libraries from inside a zip archive.

8
tools/zipalign/ZipAlign.cpp
View File

@@ -33,21 +33,21 @@ void usage(void)
fprintf(stderr, "Copyright (C) 2009 The Android Open Source Project\n\n"); fprintf(stderr, "Copyright (C) 2009 The Android Open Source Project\n\n");
fprintf(stderr, fprintf(stderr,
"Usage: zipalign [-f] [-p] [-v] [-z] <align> infile.zip outfile.zip\n" "Usage: zipalign [-f] [-p] [-v] [-z] <align> infile.zip outfile.zip\n"
" zipalign -c [-v] <align> infile.zip [list of files]\n\n" ); " zipalign -c [-v] <align> infile.zip\n\n" );
fprintf(stderr, fprintf(stderr,
" <align>: alignment in bytes, e.g. '4' provides 32-bit alignment\n"); " <align>: alignment in bytes, e.g. '4' provides 32-bit alignment\n");
fprintf(stderr, " -c: check alignment only (does not modify file)\n"); fprintf(stderr, " -c: check alignment only (does not modify file)\n");
fprintf(stderr, " -f: overwrite existing outfile.zip\n"); fprintf(stderr, " -f: overwrite existing outfile.zip\n");
fprintf(stderr, " -p: page align stored shared object: files\n"); fprintf(stderr, " -p: page align stored shared object files\n");
fprintf(stderr, " -v: verbose output\n"); fprintf(stderr, " -v: verbose output\n");
fprintf(stderr, " -z: recompress using Zopfli\n"); fprintf(stderr, " -z: recompress using Zopfli\n");
} }
static const int kPageAlignment = 4096;
static int getAlignment(bool pageAlignSharedLibs, int defaultAlignment, static int getAlignment(bool pageAlignSharedLibs, int defaultAlignment,
ZipEntry* pEntry) { ZipEntry* pEntry) {
static const int kPageAlignment = 4096;
if (!pageAlignSharedLibs) { if (!pageAlignSharedLibs) {
return defaultAlignment; return defaultAlignment;
} }