Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30b5ed7b authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Fix zipalign README file and usage strings."

parents 095c4515 e0b8d19f

tools/zipalign/README.txt

+5 −0
Original line number Diff line number Diff line
@@ -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.

tools/zipalign/ZipAlign.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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;

    }