am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."

[android/aapt.git] / ZipEntry.cpp

diff --git a/ZipEntry.cpp b/ZipEntry.cpp
index b00135ea903837c93b5efefb9555ef25a3539a57..b575988f027734d97a4824bd1e1448ade612857d 100644 (file)
--- a/ZipEntry.cpp
+++ b/ZipEntry.cpp
@@ -90,7 +90,7 @@ status_t ZipEntry::initFromCDE(FILE* fp)
      * prefer the CDE values.)
      */
     if (!hasDD && !compareHeaders()) {
      * prefer the CDE values.)
      */
     if (!hasDD && !compareHeaders()) {

-        LOGW("warning: header mismatch\n");
+        ALOGW("warning: header mismatch\n");

         // keep going?
     }
 
         // keep going?
     }
 


@@ -200,7 +200,7 @@ status_t ZipEntry::addPadding(int padding)
     if (padding <= 0)
         return INVALID_OPERATION;
 
     if (padding <= 0)
         return INVALID_OPERATION;
 

-    //LOGI("HEY: adding %d pad bytes to existing %d in %s\n",
+    //ALOGI("HEY: adding %d pad bytes to existing %d in %s\n",

     //    padding, mLFH.mExtraFieldLength, mCDE.mFileName);
 
     if (mLFH.mExtraFieldLength > 0) {
     //    padding, mLFH.mExtraFieldLength, mCDE.mFileName);
 
     if (mLFH.mExtraFieldLength > 0) {