diff options
| author | Narayan Kamath <narayan@google.com> | 2015-02-26 17:57:55 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-02-27 14:17:17 +0000 |
| commit | e0b8d19f3159edbeecb7eea4b3d18ffeca3dd33d (patch) | |
| tree | c84badd1144b08e44248cb1681d5721099e5ae6c /tools/zipalign | |
| parent | 095c451541765c7efb9d5a8152f8ef15626ccedb (diff) | |
| download | build-e0b8d19f3159edbeecb7eea4b3d18ffeca3dd33d.tar.gz build-e0b8d19f3159edbeecb7eea4b3d18ffeca3dd33d.tar.bz2 build-e0b8d19f3159edbeecb7eea4b3d18ffeca3dd33d.zip | |
Fix zipalign README file and usage strings.
Addresses comments from change 13e5965306.
Change-Id: I0a2c0048781858d3aa06347a77220547cfcdcebe
Diffstat (limited to 'tools/zipalign')
| -rw-r--r-- | tools/zipalign/README.txt | 5 | ||||
| -rw-r--r-- | tools/zipalign/ZipAlign.cpp | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tools/zipalign/README.txt b/tools/zipalign/README.txt index 9c7d07e53..0b80b3535 100644 --- a/tools/zipalign/README.txt +++ b/tools/zipalign/README.txt @@ -5,6 +5,7 @@ usage: zipalign [-f] [-v] <align> infile.zip outfile.zip -c : check alignment only (does not modify file) -f : overwrite existing outfile.zip + -p : page align stored shared object files -v : verbose output <align> is in bytes, e.g. "4" provides 32-bit alignment 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. +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. + diff --git a/tools/zipalign/ZipAlign.cpp b/tools/zipalign/ZipAlign.cpp index 191dd4112..a2dfd0289 100644 --- a/tools/zipalign/ZipAlign.cpp +++ b/tools/zipalign/ZipAlign.cpp @@ -33,21 +33,21 @@ void usage(void) fprintf(stderr, "Copyright (C) 2009 The Android Open Source Project\n\n"); fprintf(stderr, "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, " <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, " -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, " -z: recompress using Zopfli\n"); } -static const int kPageAlignment = 4096; - static int getAlignment(bool pageAlignSharedLibs, int defaultAlignment, ZipEntry* pEntry) { + static const int kPageAlignment = 4096; + if (!pageAlignSharedLibs) { return defaultAlignment; } |