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

Commit de005f0c authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Enable -Werror on zipalign"

parents a9787796 2c6fbca5

tools/zipalign/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -35,4 +35,6 @@ endif # BUILD_HOST_static 
LOCAL_MODULE := zipalign

LOCAL_MODULE_HOST_OS := darwin linux windows



LOCAL_CFLAGS := -Werror



include $(BUILD_HOST_EXECUTABLE)

tools/zipalign/ZipEntry.cpp

+1 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ void ZipEntry::initNew(const char* fileName, const char* comment) 
 *

 * Initializes the CDE and the LFH.

 */

status_t ZipEntry::initFromExternal(const ZipFile* pZipFile,

status_t ZipEntry::initFromExternal(const ZipFile*,

    const ZipEntry* pEntry)

{

    /*
@@ -694,4 +694,3 @@ void ZipEntry::CentralDirEntry::dump(void) const 
    if (mFileComment != NULL)

        ALOGD("  comment: '%s'\n", mFileComment);

}