projects
/
android
/
aapt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
am 13a0271c: Merge "Add aapt support for generating proguard rules for onClick method...
[android/aapt.git]
/
ZipFile.cpp
diff --git
a/ZipFile.cpp
b/ZipFile.cpp
index 6428e9d4d421c5be4deef1f0b7a44a7531d55c19..3994c3190a74f84248a18df50a722bd057bf33a4 100644
(file)
--- a/
ZipFile.cpp
+++ b/
ZipFile.cpp
@@
-20,8
+20,8
@@
#define LOG_TAG "zip"
#define LOG_TAG "zip"
-#include <utils/ZipUtils.h>
#include <utils/Log.h>
#include <utils/Log.h>
+#include <utils/ZipUtils.h>
#include "ZipFile.h"
#include "ZipFile.h"
@@
-780,7
+780,7
@@
status_t ZipFile::compressFpToFp(FILE* dstFp, FILE* srcFp,
if (zerr != Z_OK) {
result = UNKNOWN_ERROR;
if (zerr == Z_VERSION_ERROR) {
if (zerr != Z_OK) {
result = UNKNOWN_ERROR;
if (zerr == Z_VERSION_ERROR) {
- LOGE("Installed zlib is not compatible with linked version (%s)\n",
+
A
LOGE("Installed zlib is not compatible with linked version (%s)\n",
ZLIB_VERSION);
} else {
ALOGD("Call to deflateInit2 failed (zerr=%d)\n", zerr);
ZLIB_VERSION);
} else {
ALOGD("Call to deflateInit2 failed (zerr=%d)\n", zerr);
@@
-1019,7
+1019,7
@@
status_t ZipFile::crunchArchive(void)
pEntry->getLFHOffset(), span);
if (result != NO_ERROR) {
/* this is why you use a temp file */
pEntry->getLFHOffset(), span);
if (result != NO_ERROR) {
/* this is why you use a temp file */
- LOGE("error during crunch - archive is toast\n");
+
A
LOGE("error during crunch - archive is toast\n");
return result;
}
return result;
}