Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic34de235eb1cd094af555d7299da643a626ca092
diff --git a/lib/ExecutionEngine/MCCacheReader.cpp b/lib/ExecutionEngine/MCCacheReader.cpp
index cddd47b..4e84a73 100644
--- a/lib/ExecutionEngine/MCCacheReader.cpp
+++ b/lib/ExecutionEngine/MCCacheReader.cpp
@@ -81,7 +81,7 @@
mpResult.reset(new (nothrow) ScriptCached(S));
if (!mpResult) {
- LOGE("Unable to allocate ScriptCached object.\n");
+ ALOGE("Unable to allocate ScriptCached object.\n");
return false;
}
@@ -103,14 +103,14 @@
bool MCCacheReader::checkFileSize() {
struct stat stfile;
if (fstat(mInfoFile->getFD(), &stfile) < 0) {
- LOGE("Unable to stat cache file.\n");
+ ALOGE("Unable to stat cache file.\n");
return false;
}
mInfoFileSize = stfile.st_size;
if (mInfoFileSize < (off_t)sizeof(MCO_Header)) {
- LOGE("Cache file is too small to be correct.\n");
+ ALOGE("Cache file is too small to be correct.\n");
return false;
}
@@ -120,19 +120,19 @@
bool MCCacheReader::readHeader() {
if (mInfoFile->seek(0, SEEK_SET) != 0) {
- LOGE("Unable to seek to 0. (reason: %s)\n", strerror(errno));
+ ALOGE("Unable to seek to 0. (reason: %s)\n", strerror(errno));
return false;
}
mpHeader = (MCO_Header *)malloc(sizeof(MCO_Header));
if (!mpHeader) {
- LOGE("Unable to allocate for cache header.\n");
+ ALOGE("Unable to allocate for cache header.\n");
return false;
}
if (mInfoFile->read(reinterpret_cast<char *>(mpHeader), sizeof(MCO_Header)) !=
(ssize_t)sizeof(MCO_Header)) {
- LOGE("Unable to read cache header.\n");
+ ALOGE("Unable to read cache header.\n");
return false;
}
@@ -148,7 +148,7 @@
bool MCCacheReader::checkHeader() {
if (memcmp(mpHeader->magic, OBCC_MAGIC, 4) != 0) {
- LOGE("Bad magic word\n");
+ ALOGE("Bad magic word\n");
return false;
}
@@ -168,14 +168,14 @@
bool isLittleEndian = (*reinterpret_cast<char *>(&number) == 1);
if ((isLittleEndian && mpHeader->endianness != 'e') ||
(!isLittleEndian && mpHeader->endianness != 'E')) {
- LOGE("Machine endianness mismatch.\n");
+ ALOGE("Machine endianness mismatch.\n");
return false;
}
if ((unsigned int)mpHeader->sizeof_off_t != sizeof(off_t) ||
(unsigned int)mpHeader->sizeof_size_t != sizeof(size_t) ||
(unsigned int)mpHeader->sizeof_ptr_t != sizeof(void *)) {
- LOGE("Machine integer size mismatch.\n");
+ ALOGE("Machine integer size mismatch.\n");
return false;
}
@@ -190,17 +190,17 @@
off_t size = (off_t)mpHeader-> NAME##_size; \
\
if (mInfoFileSize < offset || mInfoFileSize < offset + size) { \
- LOGE(#NAME " section overflow.\n"); \
+ ALOGE(#NAME " section overflow.\n"); \
return false; \
} \
\
if (offset % sizeof(int) != 0) { \
- LOGE(#NAME " offset must aligned to %d.\n", (int)sizeof(int)); \
+ ALOGE(#NAME " offset must aligned to %d.\n", (int)sizeof(int)); \
return false; \
} \
\
if (size < static_cast<off_t>(sizeof(size_t))) { \
- LOGE(#NAME " size is too small to be correct.\n"); \
+ ALOGE(#NAME " size is too small to be correct.\n"); \
return false; \
} \
} while (0)
@@ -220,7 +220,7 @@
TYPE *NAME##_raw = (TYPE *)malloc(mpHeader->NAME##_size); \
\
if (!NAME##_raw) { \
- LOGE("Unable to allocate for " #NAME "\n"); \
+ ALOGE("Unable to allocate for " #NAME "\n"); \
return false; \
} \
\
@@ -228,14 +228,14 @@
AUTO_MANAGED_HOLDER = NAME##_raw; \
\
if (mInfoFile->seek(mpHeader->NAME##_offset, SEEK_SET) == -1) { \
- LOGE("Unable to seek to " #NAME " section\n"); \
+ ALOGE("Unable to seek to " #NAME " section\n"); \
return false; \
} \
\
if (mInfoFile->read(reinterpret_cast<char *>(NAME##_raw), \
mpHeader->NAME##_size) != (ssize_t)mpHeader->NAME##_size) \
{ \
- LOGE("Unable to read " #NAME ".\n"); \
+ ALOGE("Unable to read " #NAME ".\n"); \
return false; \
}
@@ -263,7 +263,7 @@
// Ensure that every c-style string is ended with '\0'
for (size_t i = 0; i < poolR->count; ++i) {
if (pool[i][poolR->list[i].length] != '\0') {
- LOGE("The %lu-th string does not end with '\\0'.\n", (unsigned long)i);
+ ALOGE("The %lu-th string does not end with '\\0'.\n", (unsigned long)i);
return false;
}
}
@@ -281,7 +281,7 @@
bool MCCacheReader::checkDependency() {
if (mDependencies.size() != mpCachedDependTable->count) {
- LOGE("Dependencies count mismatch. (%lu vs %lu)\n",
+ ALOGE("Dependencies count mismatch. (%lu vs %lu)\n",
(unsigned long)mDependencies.size(),
(unsigned long)mpCachedDependTable->count);
return false;
@@ -302,18 +302,18 @@
unsigned char const *depCachedSHA1 = depCached->sha1;
if (depName != depCachedName) {
- LOGE("Cache dependency name mismatch:\n");
- LOGE(" given: %s\n", depName.c_str());
- LOGE(" cached: %s\n", depCachedName);
+ ALOGE("Cache dependency name mismatch:\n");
+ ALOGE(" given: %s\n", depName.c_str());
+ ALOGE(" cached: %s\n", depCachedName);
return false;
}
if (memcmp(depSHA1, depCachedSHA1, 20) != 0) {
- LOGE("Cache dependency %s sha1 mismatch:\n", depCachedName);
+ ALOGE("Cache dependency %s sha1 mismatch:\n", depCachedName);
#define PRINT_SHA1(PREFIX, X, POSTFIX) \
- LOGE(PREFIX "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" \
+ ALOGE(PREFIX "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" \
"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" POSTFIX, \
X[0], X[1], X[2], X[3], X[4], X[5], X[6], X[7], X[8], X[9], \
X[10],X[11],X[12],X[13],X[14],X[15],X[16],X[17],X[18],X[19]);
@@ -327,7 +327,7 @@
}
if (depType != depCachedType) {
- LOGE("Cache dependency %s resource type mismatch.\n", depCachedName);
+ ALOGE("Cache dependency %s resource type mismatch.\n", depCachedName);
return false;
}
}
@@ -343,7 +343,7 @@
malloc(sizeof(size_t) +
sizeof(void*) * export_var_name_list_raw->count);
if (!mpResult->mpExportVars) {
- LOGE("Unable to allocate for mpExportVars\n");
+ ALOGE("Unable to allocate for mpExportVars\n");
return false;
}
mpResult->mpExportVars->count = export_var_name_list_raw->count;
@@ -367,7 +367,7 @@
malloc(sizeof(size_t) +
sizeof(void*) * export_func_name_list_raw->count);
if (!mpResult->mpExportFuncs) {
- LOGE("Unable to allocate for mpExportFuncs\n");
+ ALOGE("Unable to allocate for mpExportFuncs\n");
return false;
}
mpResult->mpExportFuncs->count = export_func_name_list_raw->count;
@@ -419,7 +419,7 @@
}
}
- LOGE("Unable to resolve symbol: %s\n", name);
+ ALOGE("Unable to resolve symbol: %s\n", name);
return NULL;
}
@@ -431,7 +431,7 @@
mEmittedELFExecutable.append(readBuffer, readBuffer + readSize);
}
if (readSize != 0) {
- LOGE("Read file Error");
+ ALOGE("Read file Error");
return false;
}
ALOGD("Read object file size %d", (int)mEmittedELFExecutable.size());