Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I8bd96961e369a08e86ff78b82d90f20f42787eb1

6 files changed, 19 insertions, 19 deletions

diff --git a/libdex/DexFile.cpp b/libdex/DexFile.cpp
index 4dcc09738..4a2b47ee3 100644
--- a/libdex/DexFile.cpp
+++ b/libdex/DexFile.cpp
@@ -252,7 +252,7 @@ DexClassLookup* dexCreateClassLookup(DexFile* pDexFile)
         totalProbes += numProbes;
     }
 
-    LOGV("Class lookup: classes=%d slots=%d (%d%% occ) alloc=%d"
+    ALOGV("Class lookup: classes=%d slots=%d (%d%% occ) alloc=%d"
          " total=%d max=%d",
         pDexFile->pHeader->classDefsSize, numEntries,
         (100 * pDexFile->pHeader->classDefsSize) / numEntries,
@@ -315,7 +315,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
         }
 
         pDexFile->pOptHeader = (const DexOptHeader*) data;
-        LOGV("Good opt header, DEX offset is %d, flags=0x%02x",
+        ALOGV("Good opt header, DEX offset is %d, flags=0x%02x",
             pDexFile->pOptHeader->dexOffset, pDexFile->pOptHeader->flags);
 
         /* parse the optimized dex file tables */
@@ -353,7 +353,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
             if (!(flags & kDexParseContinueOnError))
                 goto bail;
         } else {
-            LOGV("+++ adler32 checksum (%08x) verified", adler);
+            ALOGV("+++ adler32 checksum (%08x) verified", adler);
         }
 
         const DexOptHeader* pOptHeader = pDexFile->pOptHeader;
@@ -365,7 +365,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
                 if (!(flags & kDexParseContinueOnError))
                     goto bail;
             } else {
-                LOGV("+++ adler32 opt checksum (%08x) verified", adler);
+                ALOGV("+++ adler32 opt checksum (%08x) verified", adler);
             }
         }
     }
@@ -391,7 +391,7 @@ DexFile* dexFileParse(const u1* data, size_t length, int flags)
             if (!(flags & kDexParseContinueOnError))
                 goto bail;
         } else {
-            LOGV("+++ sha1 digest verified");
+            ALOGV("+++ sha1 digest verified");
         }
     }
 
diff --git a/libdex/DexOptData.cpp b/libdex/DexOptData.cpp
index b224d6d79..2af8ad69b 100644
--- a/libdex/DexOptData.cpp
+++ b/libdex/DexOptData.cpp
@@ -109,7 +109,7 @@ bool dexParseOptData(const u1* data, size_t length, DexFile* pDexFile)
             pDexFile->pClassLookup = (const DexClassLookup*) pOptData;
             break;
         case kDexChunkRegisterMaps:
-            LOGV("+++ found register maps, size=%u", size);
+            ALOGV("+++ found register maps, size=%u", size);
             pDexFile->pRegisterMapPool = pOptData;
             break;
         default:
diff --git a/libdex/DexSwapVerify.cpp b/libdex/DexSwapVerify.cpp
index 0d028daf5..0a742b762 100644
--- a/libdex/DexSwapVerify.cpp
+++ b/libdex/DexSwapVerify.cpp
@@ -2821,7 +2821,7 @@ int dexSwapAndVerify(u1* addr, int len)
     bool okay = true;
 
     memset(&state, 0, sizeof(state));
-    LOGV("+++ swapping and verifying");
+    ALOGV("+++ swapping and verifying");
 
     /*
      * Note: The caller must have verified that "len" is at least as
diff --git a/libdex/OptInvocation.cpp b/libdex/OptInvocation.cpp
index 4e88c249d..636420a0a 100644
--- a/libdex/OptInvocation.cpp
+++ b/libdex/OptInvocation.cpp
@@ -102,7 +102,7 @@ char* dexOptGenerateCacheFileName(const char* fileName, const char* subFileName)
      */
     strncat(nameBuf, absoluteFile, kBufLen);
 
-    LOGV("Cache file for '%s' '%s' is '%s'", fileName, subFileName, nameBuf);
+    ALOGV("Cache file for '%s' '%s' is '%s'", fileName, subFileName, nameBuf);
     return strdup(nameBuf);
 }
 
diff --git a/libdex/SysUtil.cpp b/libdex/SysUtil.cpp
index da5eb97a2..333016441 100644
--- a/libdex/SysUtil.cpp
+++ b/libdex/SysUtil.cpp
@@ -244,7 +244,7 @@ int sysMapFileInShmemWritableReadOnly(int fd, MemMapping* pMap)
     if (mprotect(memPtr, length, PROT_READ) < 0) {
         /* this fails with EACCESS on FAT filesystems, e.g. /sdcard */
         int err = errno;
-        LOGV("mprotect(%p, %d, PROT_READ) failed: %s",
+        ALOGV("mprotect(%p, %d, PROT_READ) failed: %s",
             memPtr, length, strerror(err));
         LOGD("mprotect(RO) failed (%d), file will remain read-write", err);
     }
@@ -338,7 +338,7 @@ int sysChangeMapAccess(void* addr, size_t length, int wantReadWrite,
     int prot = wantReadWrite ? (PROT_READ|PROT_WRITE) : (PROT_READ);
     if (mprotect(alignAddr, alignLength, prot) != 0) {
         int err = errno;
-        LOGV("mprotect (%p,%zd,%d) failed: %s",
+        ALOGV("mprotect (%p,%zd,%d) failed: %s",
             alignAddr, alignLength, prot, strerror(errno));
         return (errno != 0) ? errno : -1;
     }
@@ -361,7 +361,7 @@ void sysReleaseShmem(MemMapping* pMap)
         LOGW("munmap(%p, %d) failed: %s",
             pMap->baseAddr, (int)pMap->baseLength, strerror(errno));
     } else {
-        LOGV("munmap(%p, %d) succeeded", pMap->baseAddr, pMap->baseLength);
+        ALOGV("munmap(%p, %d) succeeded", pMap->baseAddr, pMap->baseLength);
         pMap->baseAddr = NULL;
         pMap->baseLength = 0;
     }
diff --git a/libdex/ZipArchive.cpp b/libdex/ZipArchive.cpp
index 59d28d90c..6e2aee732 100644
--- a/libdex/ZipArchive.cpp
+++ b/libdex/ZipArchive.cpp
@@ -165,7 +165,7 @@ static int mapCentralDirectory0(int fd, const char* debugFileName,
     int i;
     for (i = readAmount - kEOCDLen; i >= 0; i--) {
         if (scanBuf[i] == 0x50 && get4LE(&scanBuf[i]) == kEOCDSignature) {
-            LOGV("+++ Found EOCD at buf+%d", i);
+            ALOGV("+++ Found EOCD at buf+%d", i);
             break;
         }
     }
@@ -197,7 +197,7 @@ static int mapCentralDirectory0(int fd, const char* debugFileName,
         return -1;
     }
 
-    LOGV("+++ numEntries=%d dirSize=%d dirOffset=%d",
+    ALOGV("+++ numEntries=%d dirSize=%d dirOffset=%d",
         numEntries, dirSize, dirOffset);
 
     /*
@@ -233,7 +233,7 @@ static int mapCentralDirectory(int fd, const char* debugFileName,
      */
     off_t fileLength = lseek(fd, 0, SEEK_END);
     if (fileLength < kEOCDLen) {
-        LOGV("Zip: length %ld is too small to be zip", (long) fileLength);
+        ALOGV("Zip: length %ld is too small to be zip", (long) fileLength);
         return -1;
     }
 
@@ -325,7 +325,7 @@ static int parseZipArchive(ZipArchive* pArchive)
             goto bail;
         }
     }
-    LOGV("+++ zip good scan %d entries", numEntries);
+    ALOGV("+++ zip good scan %d entries", numEntries);
 
     result = 0;
 
@@ -348,14 +348,14 @@ int dexZipOpenArchive(const char* fileName, ZipArchive* pArchive)
 {
     int fd, err;
 
-    LOGV("Opening as zip '%s' %p", fileName, pArchive);
+    ALOGV("Opening as zip '%s' %p", fileName, pArchive);
 
     memset(pArchive, 0, sizeof(ZipArchive));
 
     fd = open(fileName, O_RDONLY | O_BINARY, 0);
     if (fd < 0) {
         err = errno ? errno : -1;
-        LOGV("Unable to open '%s': %s", fileName, strerror(err));
+        ALOGV("Unable to open '%s': %s", fileName, strerror(err));
         return err;
     }
 
@@ -378,7 +378,7 @@ int dexZipPrepArchive(int fd, const char* debugFileName, ZipArchive* pArchive)
         goto bail;
 
     if (parseZipArchive(pArchive) != 0) {
-        LOGV("Zip: parsing '%s' failed", debugFileName);
+        ALOGV("Zip: parsing '%s' failed", debugFileName);
         goto bail;
     }
 
@@ -399,7 +399,7 @@ bail:
  */
 void dexZipCloseArchive(ZipArchive* pArchive)
 {
-    LOGV("Closing archive %p", pArchive);
+    ALOGV("Closing archive %p", pArchive);
 
     if (pArchive->mFd >= 0)
         close(pArchive->mFd);