diff options
| author | Alex Klyubin <klyubin@google.com> | 2016-04-29 20:35:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-29 20:35:07 +0000 |
| commit | 2a1030745522d72d5ed59851f18d292c1c89052a (patch) | |
| tree | 942b43f405ce899fa7e07ab81f89558dff5902dd /tools/zipalign | |
| parent | 21291ad01bccf1d58e2cc19878ca62d8c391b248 (diff) | |
| parent | b6587f9895e61751e9a85faa3ab7ace753dcf07e (diff) | |
| download | platform_build-2a1030745522d72d5ed59851f18d292c1c89052a.tar.gz platform_build-2a1030745522d72d5ed59851f18d292c1c89052a.tar.bz2 platform_build-2a1030745522d72d5ed59851f18d292c1c89052a.zip | |
Merge "zipalign supports -p also when checking alignment." am: 401f8b953f
am: b6587f9895
* commit 'b6587f9895e61751e9a85faa3ab7ace753dcf07e':
zipalign supports -p also when checking alignment.
Change-Id: I11207ce34a3f2d3a5c55df4ac67c92c7032e5b68
Diffstat (limited to 'tools/zipalign')
| -rw-r--r-- | tools/zipalign/ZipAlign.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/zipalign/ZipAlign.cpp b/tools/zipalign/ZipAlign.cpp index a2dfd02891..aef91a594e 100644 --- a/tools/zipalign/ZipAlign.cpp +++ b/tools/zipalign/ZipAlign.cpp @@ -33,12 +33,12 @@ 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\n\n" ); + " zipalign -c [-p] [-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: memory page alignment for stored shared object files\n"); fprintf(stderr, " -v: verbose output\n"); fprintf(stderr, " -z: recompress using Zopfli\n"); } |