StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Remove changing uids/timestamps from zip/jar files"

Browse Source 
This reverts commit 3c2c064c87.

zipalign depends on libandroidfw, and some setups don't include frameworks/base.

Bug: 24201956
Change-Id: I48ee95808924f6b2221f0a49ab205c2565096b1f
This commit is contained in:
Dan Willemsen
2015-10-29 21:26:18 +00:00
parent 3c2c064c87
commit b589ae4e26
13 changed files with 53 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/zipalign/ZipFile.h
View File

@@ -77,17 +77,17 @@ public:
*
* If "ppEntry" is non-NULL, a pointer to the new entry will be returned.
*/
status_t add(const char* fileName, int compressionMethod, bool removeTime,
status_t add(const char* fileName, int compressionMethod,
ZipEntry** ppEntry)
{
return add(fileName, fileName, compressionMethod, removeTime, ppEntry);
return add(fileName, fileName, compressionMethod, ppEntry);
}
status_t add(const char* fileName, const char* storageName,
int compressionMethod, bool removeTime, ZipEntry** ppEntry)
int compressionMethod, ZipEntry** ppEntry)
{
return addCommon(fileName, NULL, 0, storageName,
ZipEntry::kCompressStored,
compressionMethod, removeTime, ppEntry);
compressionMethod, ppEntry);
}
/*
@@ -96,12 +96,11 @@ public:
* If "ppEntry" is non-NULL, a pointer to the new entry will be returned.
*/
status_t addGzip(const char* fileName, const char* storageName,
bool removeTime, ZipEntry** ppEntry)
ZipEntry** ppEntry)
{
return addCommon(fileName, NULL, 0, storageName,
ZipEntry::kCompressDeflated,
ZipEntry::kCompressDeflated,
removeTime, ppEntry);
ZipEntry::kCompressDeflated, ppEntry);
}
/*
@@ -110,11 +109,11 @@ public:
* If "ppEntry" is non-NULL, a pointer to the new entry will be returned.
*/
status_t add(const void* data, size_t size, const char* storageName,
int compressionMethod, bool removeTime, ZipEntry** ppEntry)
int compressionMethod, ZipEntry** ppEntry)
{
return addCommon(NULL, data, size, storageName,
ZipEntry::kCompressStored,
compressionMethod, removeTime, ppEntry);
compressionMethod, ppEntry);
}
/*
@@ -125,7 +124,7 @@ public:
* If "ppEntry" is non-NULL, a pointer to the new entry will be returned.
*/
status_t add(const ZipFile* pSourceZip, const ZipEntry* pSourceEntry,
int padding, bool removeTime, ZipEntry** ppEntry);
int padding, ZipEntry** ppEntry);
/*
* Add an entry by copying it from another zip file, recompressing with
@@ -134,7 +133,7 @@ public:
* If "ppEntry" is non-NULL, a pointer to the new entry will be returned.
*/
status_t addRecompress(const ZipFile* pSourceZip, const ZipEntry* pSourceEntry,
bool removeTime, ZipEntry** ppEntry);
ZipEntry** ppEntry);
/*
* Mark an entry as having been removed. It is not actually deleted
@@ -233,7 +232,7 @@ private:
/* common handler for all "add" functions */
status_t addCommon(const char* fileName, const void* data, size_t size,
const char* storageName, int sourceType, int compressionMethod,
bool removeTime, ZipEntry** ppEntry);
ZipEntry** ppEntry);
/* copy all of "srcFp" into "dstFp" */
status_t copyFpToFp(FILE* dstFp, FILE* srcFp, unsigned long* pCRC32);