Revert "Remove changing uids/timestamps from zip/jar files"
This reverts commit 3c2c064c8791ed2d4b9d6780d7b87f406ab78f10.
zipalign depends on libandroidfw, and some setups don't include frameworks/base.
Bug: 24201956
Change-Id: I48ee95808924f6b2221f0a49ab205c2565096b1f
diff --git a/tools/zipalign/ZipFile.h b/tools/zipalign/ZipFile.h
index 787576f..b99cda5 100644
--- a/tools/zipalign/ZipFile.h
+++ b/tools/zipalign/ZipFile.h
@@ -77,17 +77,17 @@
*
* 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 @@
* 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 @@
* 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 @@
* 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 @@
* 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 @@
/* 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);