summaryrefslogtreecommitdiffstats
path: root/vm/JarFile.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-20 11:55:54 +0100
committerSteve Block <steveblock@google.com>2011-10-26 11:28:18 +0100
commit92c1f6f1b4249e4e379452ee7b49f027052bf4ce (patch)
tree87cba8cfe24fcdc10e3f2018f0571087989f6429 /vm/JarFile.cpp
parent1663a6c12fdf4732d7ea0a0406af6085b3c408e4 (diff)
downloadandroid_dalvik-92c1f6f1b4249e4e379452ee7b49f027052bf4ce.tar.gz
android_dalvik-92c1f6f1b4249e4e379452ee7b49f027052bf4ce.tar.bz2
android_dalvik-92c1f6f1b4249e4e379452ee7b49f027052bf4ce.zip
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
Diffstat (limited to 'vm/JarFile.cpp')
-rw-r--r--vm/JarFile.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/vm/JarFile.cpp b/vm/JarFile.cpp
index 0499e9b46..2af34b8d0 100644
--- a/vm/JarFile.cpp
+++ b/vm/JarFile.cpp
@@ -73,7 +73,7 @@ static int openAlternateSuffix(const char *fileName, const char *suffix,
*pCachedName = buf;
return fd;
}
- LOGV("Couldn't open %s: %s", buf, strerror(errno));
+ ALOGV("Couldn't open %s: %s", buf, strerror(errno));
bail:
free(buf);
return -1;
@@ -116,7 +116,7 @@ DexCacheStatus dvmDexCacheStatus(const char *fileName)
* See if there's an up-to-date copy of the optimized dex
* in the cache, but don't create one if there isn't.
*/
- LOGV("dvmDexCacheStatus: Checking cache for %s", fileName);
+ ALOGV("dvmDexCacheStatus: Checking cache for %s", fileName);
cachedName = dexOptGenerateCacheFileName(fileName, kDexInJarName);
if (cachedName == NULL)
return DEX_CACHE_BAD_ARCHIVE;
@@ -125,7 +125,7 @@ DexCacheStatus dvmDexCacheStatus(const char *fileName)
dexGetZipEntryModTime(&archive, entry),
dexGetZipEntryCrc32(&archive, entry),
/*isBootstrap=*/false, &newFile, /*createIfMissing=*/false);
- LOGV("dvmOpenCachedDexFile returned fd %d", fd);
+ ALOGV("dvmOpenCachedDexFile returned fd %d", fd);
if (fd < 0) {
result = DEX_CACHE_STALE;
goto bail;
@@ -156,14 +156,14 @@ DexCacheStatus dvmDexCacheStatus(const char *fileName)
goto bail;
}
- LOGV("Using alternate file (odex) for %s ...", fileName);
+ ALOGV("Using alternate file (odex) for %s ...", fileName);
if (!dvmCheckOptHeaderAndDependencies(fd, false, 0, 0, true, true)) {
LOGE("%s odex has stale dependencies", fileName);
LOGE("odex source not available -- failing");
result = DEX_CACHE_STALE_ODEX;
goto bail;
} else {
- LOGV("%s odex has good dependencies", fileName);
+ ALOGV("%s odex has good dependencies", fileName);
}
}
result = DEX_CACHE_OK;
@@ -217,7 +217,7 @@ int dvmJarFileOpen(const char* fileName, const char* odexOutputName,
*/
fd = openAlternateSuffix(fileName, "odex", O_RDONLY, &cachedName);
if (fd >= 0) {
- LOGV("Using alternate file (odex) for %s ...", fileName);
+ ALOGV("Using alternate file (odex) for %s ...", fileName);
if (!dvmCheckOptHeaderAndDependencies(fd, false, 0, 0, true, true)) {
LOGE("%s odex has stale dependencies", fileName);
free(cachedName);
@@ -226,7 +226,7 @@ int dvmJarFileOpen(const char* fileName, const char* odexOutputName,
fd = -1;
goto tryArchive;
} else {
- LOGV("%s odex has good dependencies", fileName);
+ ALOGV("%s odex has good dependencies", fileName);
//TODO: make sure that the .odex actually corresponds
// to the classes.dex inside the archive (if present).
// For typical use there will be no classes.dex.
@@ -262,7 +262,7 @@ tryArchive:
} else {
cachedName = strdup(odexOutputName);
}
- LOGV("dvmJarFileOpen: Checking cache for %s (%s)",
+ ALOGV("dvmJarFileOpen: Checking cache for %s (%s)",
fileName, cachedName);
fd = dvmOpenCachedDexFile(fileName, cachedName,
dexGetZipEntryModTime(&archive, entry),
@@ -341,7 +341,7 @@ tryArchive:
locked = false;
}
- LOGV("Successfully opened '%s' in '%s'", kDexInJarName, fileName);
+ ALOGV("Successfully opened '%s' in '%s'", kDexInJarName, fileName);
*ppJarFile = (JarFile*) calloc(1, sizeof(JarFile));
(*ppJarFile)->archive = archive;