summaryrefslogtreecommitdiffstats
path: root/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-20 11:56:00 +0100
committerSteve Block <steveblock@google.com>2011-10-26 09:57:54 +0100
commit71f2cf116aab893e224056c38ab146bd1538dd3e (patch)
tree75a9162a0ea00830184b12a9ca51d3a1a040a5bb /core/jni/com_android_internal_content_NativeLibraryHelper.cpp
parent1da79501066a74b630c8aa138db0f86ab6c690bb (diff)
downloadframeworks_base-71f2cf116aab893e224056c38ab146bd1538dd3e.zip
frameworks_base-71f2cf116aab893e224056c38ab146bd1538dd3e.tar.gz
frameworks_base-71f2cf116aab893e224056c38ab146bd1538dd3e.tar.bz2
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: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
Diffstat (limited to 'core/jni/com_android_internal_content_NativeLibraryHelper.cpp')
-rw-r--r--core/jni/com_android_internal_content_NativeLibraryHelper.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
index 5118351..9d2ab28 100644
--- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
+++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp
@@ -101,7 +101,7 @@ isFileDifferent(const char* filePath, size_t fileSize, time_t modifiedTime,
{
if (lstat64(filePath, st) < 0) {
// File is not found or cannot be read.
- LOGV("Couldn't stat %s, copying: %s\n", filePath, strerror(errno));
+ ALOGV("Couldn't stat %s, copying: %s\n", filePath, strerror(errno));
return true;
}
@@ -115,13 +115,13 @@ isFileDifferent(const char* filePath, size_t fileSize, time_t modifiedTime,
// For some reason, bionic doesn't define st_mtime as time_t
if (time_t(st->st_mtime) != modifiedTime) {
- LOGV("mod time doesn't match: %ld vs. %ld\n", st->st_mtime, modifiedTime);
+ ALOGV("mod time doesn't match: %ld vs. %ld\n", st->st_mtime, modifiedTime);
return true;
}
int fd = TEMP_FAILURE_RETRY(open(filePath, O_RDONLY));
if (fd < 0) {
- LOGV("Couldn't open file %s: %s", filePath, strerror(errno));
+ ALOGV("Couldn't open file %s: %s", filePath, strerror(errno));
return true;
}
@@ -133,7 +133,7 @@ isFileDifferent(const char* filePath, size_t fileSize, time_t modifiedTime,
}
close(fd);
- LOGV("%s: crc = %lx, zipCrc = %lx\n", filePath, crc, zipCrc);
+ ALOGV("%s: crc = %lx, zipCrc = %lx\n", filePath, crc, zipCrc);
if (crc != zipCrc) {
return true;
@@ -261,7 +261,7 @@ copyFileIfChanged(JNIEnv *env, void* arg, ZipFileRO* zipFile, ZipEntryRO zipEntr
return INSTALL_FAILED_CONTAINER_ERROR;
}
- LOGV("Successfully moved %s to %s\n", localTmpFileName, localFileName);
+ ALOGV("Successfully moved %s to %s\n", localTmpFileName, localFileName);
return INSTALL_SUCCEEDED;
}
@@ -314,17 +314,17 @@ iterateOverNativeFiles(JNIEnv *env, jstring javaFilePath, jstring javaCpuAbi, js
const char* cpuAbiOffset = fileName + APK_LIB_LEN;
const size_t cpuAbiRegionSize = lastSlash - cpuAbiOffset;
- LOGV("Comparing ABIs %s and %s versus %s\n", cpuAbi.c_str(), cpuAbi2.c_str(), cpuAbiOffset);
+ ALOGV("Comparing ABIs %s and %s versus %s\n", cpuAbi.c_str(), cpuAbi2.c_str(), cpuAbiOffset);
if (cpuAbi.size() == cpuAbiRegionSize
&& *(cpuAbiOffset + cpuAbi.size()) == '/'
&& !strncmp(cpuAbiOffset, cpuAbi.c_str(), cpuAbiRegionSize)) {
- LOGV("Using ABI %s\n", cpuAbi.c_str());
+ ALOGV("Using ABI %s\n", cpuAbi.c_str());
} else if (cpuAbi2.size() == cpuAbiRegionSize
&& *(cpuAbiOffset + cpuAbi2.size()) == '/'
&& !strncmp(cpuAbiOffset, cpuAbi2.c_str(), cpuAbiRegionSize)) {
- LOGV("Using ABI %s\n", cpuAbi2.c_str());
+ ALOGV("Using ABI %s\n", cpuAbi2.c_str());
} else {
- LOGV("abi didn't match anything: %s (end at %zd)\n", cpuAbiOffset, cpuAbiRegionSize);
+ ALOGV("abi didn't match anything: %s (end at %zd)\n", cpuAbiOffset, cpuAbiRegionSize);
continue;
}
@@ -337,7 +337,7 @@ iterateOverNativeFiles(JNIEnv *env, jstring javaFilePath, jstring javaCpuAbi, js
install_status_t ret = callFunc(env, callArg, &zipFile, entry, lastSlash + 1);
if (ret != INSTALL_SUCCEEDED) {
- LOGV("Failure for entry %s", lastSlash + 1);
+ ALOGV("Failure for entry %s", lastSlash + 1);
return ret;
}
}