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

Commit eb0e0f46 authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

am 2e7427f3: Merge "Add LFH offset to verbose list of APK" into gingerbread 

Merge commit '2e7427f3' into gingerbread-plus-aosp

* commit '2e7427f3':
  Add LFH offset to verbose list of APK
parents fde7fdd3 2e7427f3

tools/aapt/Command.cpp

+4 −3
Original line number Diff line number Diff line
@@ -141,9 +141,9 @@ int doList(Bundle* bundle) 
    if (bundle->getVerbose()) {

        printf("Archive:  %s\n", zipFileName);

        printf(

            " Length   Method    Size  Ratio   Date   Time   CRC-32    Name\n");

            " Length   Method    Size  Ratio   Offset      Date  Time  CRC-32    Name\n");

        printf(

            "--------  ------  ------- -----   ----   ----   ------    ----\n");

            "--------  ------  ------- -----  -------      ----  ----  ------    ----\n");

    }



    totalUncLen = totalCompLen = 0;
@@ -159,12 +159,13 @@ int doList(Bundle* bundle) 
            strftime(dateBuf, sizeof(dateBuf), "%m-%d-%y %H:%M",

                localtime(&when));



            printf("%8ld  %-7.7s %7ld %3d%%  %s  %08lx  %s\n",

            printf("%8ld  %-7.7s %7ld %3d%%  %8zd  %s  %08lx  %s\n",

                (long) entry->getUncompressedLen(),

                compressionName(entry->getCompressionMethod()),

                (long) entry->getCompressedLen(),

                calcPercent(entry->getUncompressedLen(),

                            entry->getCompressedLen()),

                (size_t) entry->getLFHOffset(),

                dateBuf,

                entry->getCRC32(),

                entry->getFileName());

tools/aapt/ZipEntry.h

+5 −5
Original line number Diff line number Diff line
@@ -71,6 +71,11 @@ public: 
     */

    off_t getCompressedLen(void) const { return mCDE.mCompressedSize; }



    /*

     * Return the offset of the local file header.

     */

    off_t getLFHOffset(void) const { return mCDE.mLocalHeaderRelOffset; }



    /*

     * Return the absolute file offset of the start of the compressed or

     * uncompressed data.
@@ -185,11 +190,6 @@ protected: 
     */

    void setModWhen(time_t when);



    /*

     * Return the offset of the local file header.

     */

    off_t getLFHOffset(void) const { return mCDE.mLocalHeaderRelOffset; }



    /*

     * Set the offset of the local file header, relative to the start of

     * the current file.