Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

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

Also fix an occurrence of LOGW missed in an earlier change.

Bug: 5449033
Change-Id: I2e3b23839e6dcd09015d6402280e9300c75e3406

22 files changed, 107 insertions, 107 deletions

diff --git a/vm/compiler/Compiler.cpp b/vm/compiler/Compiler.cpp
index 4236d53b9..b9b310516 100644
--- a/vm/compiler/Compiler.cpp
+++ b/vm/compiler/Compiler.cpp
@@ -68,7 +68,7 @@ void dvmCompilerForceWorkEnqueue(const u2 *pc, WorkOrderKind kind, void* info)
         if (!success) {
             retries++;
             if (retries > ENQUEUE_MAX_RETRIES) {
-                LOGE("JIT: compiler queue wedged - forcing reset");
+                ALOGE("JIT: compiler queue wedged - forcing reset");
                 gDvmJit.codeCacheFull = true;  // Force reset
                 success = true;  // Because we'll drop the order now anyway
             } else {
@@ -169,7 +169,7 @@ bool dvmCompilerSetupCodeCache(void)
     /* Allocate the code cache */
     fd = ashmem_create_region("dalvik-jit-code-cache", gDvmJit.codeCacheSize);
     if (fd < 0) {
-        LOGE("Could not create %u-byte ashmem region for the JIT code cache",
+        ALOGE("Could not create %u-byte ashmem region for the JIT code cache",
              gDvmJit.codeCacheSize);
         return false;
     }
@@ -178,7 +178,7 @@ bool dvmCompilerSetupCodeCache(void)
                              MAP_PRIVATE , fd, 0);
     close(fd);
     if (gDvmJit.codeCache == MAP_FAILED) {
-        LOGE("Failed to mmap the JIT code cache: %s", strerror(errno));
+        ALOGE("Failed to mmap the JIT code cache: %s", strerror(errno));
         return false;
     }
 
@@ -213,7 +213,7 @@ bool dvmCompilerSetupCodeCache(void)
                           PROTECT_CODE_CACHE_ATTRS);
 
     if (result == -1) {
-        LOGE("Failed to remove the write permission for the code cache");
+        ALOGE("Failed to remove the write permission for the code cache");
         dvmAbort();
     }
 
@@ -418,7 +418,7 @@ static bool compilerThreadStartup(void)
     pJitTable = (JitEntry*)
                 calloc(gDvmJit.jitTableSize, sizeof(*pJitTable));
     if (!pJitTable) {
-        LOGE("jit table allocation failed");
+        ALOGE("jit table allocation failed");
         dvmUnlockMutex(&gDvmJit.tableLock);
         goto fail;
     }
@@ -432,7 +432,7 @@ static bool compilerThreadStartup(void)
      */
     pJitProfTable = (unsigned char *)malloc(JIT_PROF_SIZE);
     if (!pJitProfTable) {
-        LOGE("jit prof table allocation failed");
+        ALOGE("jit prof table allocation failed");
         free(pJitProfTable);
         dvmUnlockMutex(&gDvmJit.tableLock);
         goto fail;
@@ -448,7 +448,7 @@ static bool compilerThreadStartup(void)
     pJitTraceProfCounters = (JitTraceProfCounters*)
                              calloc(1, sizeof(*pJitTraceProfCounters));
     if (!pJitTraceProfCounters) {
-        LOGE("jit trace prof counters allocation failed");
+        ALOGE("jit trace prof counters allocation failed");
         dvmUnlockMutex(&gDvmJit.tableLock);
         goto fail;
     }
diff --git a/vm/compiler/Dataflow.cpp b/vm/compiler/Dataflow.cpp
index e4d0e41fa..7bed8396a 100644
--- a/vm/compiler/Dataflow.cpp
+++ b/vm/compiler/Dataflow.cpp
@@ -864,7 +864,7 @@ char *dvmCompilerGetDalvikDisassembly(const DecodedInstruction *insn,
                 offset = (int) insn->vA;
                 break;
             default:
-                LOGE("Unexpected branch format %d / opcode %#x", dalvikFormat,
+                ALOGE("Unexpected branch format %d / opcode %#x", dalvikFormat,
                      opcode);
                 dvmAbort();
                 break;
@@ -974,7 +974,7 @@ char *dvmCompilerFullDisassembler(const CompilationUnit *cUnit,
                 delta = (int) insn->vA;
                 break;
             default:
-                LOGE("Unexpected branch format: %d", dalvikFormat);
+                ALOGE("Unexpected branch format: %d", dalvikFormat);
                 dvmAbort();
                 break;
         }
diff --git a/vm/compiler/Frontend.cpp b/vm/compiler/Frontend.cpp
index 176983e91..a36eedbb6 100644
--- a/vm/compiler/Frontend.cpp
+++ b/vm/compiler/Frontend.cpp
@@ -357,22 +357,22 @@ CompilerMethodStats *dvmCompilerAnalyzeMethodBody(const Method *method,
 #if 0
     /* Uncomment the following to explore various callee patterns */
     if (attributes & METHOD_IS_THROW_FREE) {
-        LOGE("%s%s is inlinable%s", method->clazz->descriptor, method->name,
+        ALOGE("%s%s is inlinable%s", method->clazz->descriptor, method->name,
              (attributes & METHOD_IS_EMPTY) ? " empty" : "");
     }
 
     if (attributes & METHOD_IS_LEAF) {
-        LOGE("%s%s is leaf %d%s", method->clazz->descriptor, method->name,
+        ALOGE("%s%s is leaf %d%s", method->clazz->descriptor, method->name,
              insnSize, insnSize < 5 ? " (small)" : "");
     }
 
     if (attributes & (METHOD_IS_GETTER | METHOD_IS_SETTER)) {
-        LOGE("%s%s is %s", method->clazz->descriptor, method->name,
+        ALOGE("%s%s is %s", method->clazz->descriptor, method->name,
              attributes & METHOD_IS_GETTER ? "getter": "setter");
     }
     if (attributes ==
         (METHOD_IS_LEAF | METHOD_IS_THROW_FREE | METHOD_IS_CALLEE)) {
-        LOGE("%s%s is inlinable non setter/getter", method->clazz->descriptor,
+        ALOGE("%s%s is inlinable non setter/getter", method->clazz->descriptor,
              method->name);
     }
 #endif
@@ -519,7 +519,7 @@ static BasicBlock *splitBlock(CompilationUnit *cUnit,
         insn = insn->next;
     }
     if (insn == NULL) {
-        LOGE("Break split failed");
+        ALOGE("Break split failed");
         dvmAbort();
     }
     BasicBlock *bottomBlock = dvmCompilerNewBB(kDalvikByteCode,
@@ -814,7 +814,7 @@ static bool verifyPredInfo(CompilationUnit *cUnit, BasicBlock *bb)
             dvmGetBlockName(bb, blockName1);
             dvmGetBlockName(predBB, blockName2);
             dvmDumpCFG(cUnit, "/sdcard/cfg/");
-            LOGE("Successor %s not found from %s",
+            ALOGE("Successor %s not found from %s",
                  blockName1, blockName2);
             dvmAbort();
         }
@@ -909,7 +909,7 @@ static void processCanBranch(CompilationUnit *cUnit, BasicBlock *curBlock,
             target += (int) insn->dalvikInsn.vB;
             break;
         default:
-            LOGE("Unexpected opcode(%d) with kInstrCanBranch set",
+            ALOGE("Unexpected opcode(%d) with kInstrCanBranch set",
                  insn->dalvikInsn.opcode);
             dvmAbort();
     }
@@ -999,7 +999,7 @@ static void processCanSwitch(CompilationUnit *cUnit, BasicBlock *curBlock,
     }
 
     if (curBlock->successorBlockList.blockListType != kNotUsed) {
-        LOGE("Successor block list already in use: %d",
+        ALOGE("Successor block list already in use: %d",
              curBlock->successorBlockList.blockListType);
         dvmAbort();
     }
@@ -1050,13 +1050,13 @@ static void processCanThrow(CompilationUnit *cUnit, BasicBlock *curBlock,
         DexCatchIterator iterator;
 
         if (!dexFindCatchHandler(&iterator, dexCode, curOffset)) {
-            LOGE("Catch block not found in dexfile for insn %x in %s",
+            ALOGE("Catch block not found in dexfile for insn %x in %s",
                  curOffset, method->name);
             dvmAbort();
 
         }
         if (curBlock->successorBlockList.blockListType != kNotUsed) {
-            LOGE("Successor block list already in use: %d",
+            ALOGE("Successor block list already in use: %d",
                  curBlock->successorBlockList.blockListType);
             dvmAbort();
         }
diff --git a/vm/compiler/InlineTransformation.cpp b/vm/compiler/InlineTransformation.cpp
index 53278a7fb..650340c5e 100644
--- a/vm/compiler/InlineTransformation.cpp
+++ b/vm/compiler/InlineTransformation.cpp
@@ -73,7 +73,7 @@ static bool inlineGetter(CompilationUnit *cUnit,
 
     /* Expecting vA to be the destination register */
     if (dfFlags & (DF_UA | DF_UA_WIDE)) {
-        LOGE("opcode %d has DF_UA set (not expected)", getterInsn.opcode);
+        ALOGE("opcode %d has DF_UA set (not expected)", getterInsn.opcode);
         dvmAbort();
     }
 
diff --git a/vm/compiler/Loop.cpp b/vm/compiler/Loop.cpp
index 90c97d767..50e7c4852 100644
--- a/vm/compiler/Loop.cpp
+++ b/vm/compiler/Loop.cpp
@@ -26,11 +26,11 @@
 static void dumpConstants(CompilationUnit *cUnit)
 {
     int i;
-    LOGE("LOOP starting offset: %x", cUnit->entryBlock->startOffset);
+    ALOGE("LOOP starting offset: %x", cUnit->entryBlock->startOffset);
     for (i = 0; i < cUnit->numSSARegs; i++) {
         if (dvmIsBitSet(cUnit->isConstantV, i)) {
             int subNReg = dvmConvertSSARegToDalvik(cUnit, i);
-            LOGE("CONST: s%d(v%d_%d) has %d", i,
+            ALOGE("CONST: s%d(v%d_%d) has %d", i,
                  DECODE_REG(subNReg), DECODE_SUB(subNReg),
                  cUnit->constantValues[i]);
         }
@@ -48,7 +48,7 @@ static void dumpIVList(CompilationUnit *cUnit)
         int iv = dvmConvertSSARegToDalvik(cUnit, ivInfo->ssaReg);
         /* Basic IV */
         if (ivInfo->ssaReg == ivInfo->basicSSAReg) {
-            LOGE("BIV %d: s%d(v%d_%d) + %d", i,
+            ALOGE("BIV %d: s%d(v%d_%d) + %d", i,
                  ivInfo->ssaReg,
                  DECODE_REG(iv), DECODE_SUB(iv),
                  ivInfo->inc);
@@ -56,7 +56,7 @@ static void dumpIVList(CompilationUnit *cUnit)
         } else {
             int biv = dvmConvertSSARegToDalvik(cUnit, ivInfo->basicSSAReg);
 
-            LOGE("DIV %d: s%d(v%d_%d) = %d * s%d(v%d_%d) + %d", i,
+            ALOGE("DIV %d: s%d(v%d_%d) = %d * s%d(v%d_%d) + %d", i,
                  ivInfo->ssaReg,
                  DECODE_REG(iv), DECODE_SUB(iv),
                  ivInfo->m,
@@ -80,13 +80,13 @@ static void dumpHoistedChecks(CompilationUnit *cUnit)
             dvmConvertSSARegToDalvik(cUnit, arrayAccessInfo->arrayReg));
         int idxReg = DECODE_REG(
             dvmConvertSSARegToDalvik(cUnit, arrayAccessInfo->ivReg));
-        LOGE("Array access %d", i);
-        LOGE("  arrayReg %d", arrayReg);
-        LOGE("  idxReg %d", idxReg);
-        LOGE("  endReg %d", loopAnalysis->endConditionReg);
-        LOGE("  maxC %d", arrayAccessInfo->maxC);
-        LOGE("  minC %d", arrayAccessInfo->minC);
-        LOGE("  opcode %d", loopAnalysis->loopBranchOpcode);
+        ALOGE("Array access %d", i);
+        ALOGE("  arrayReg %d", arrayReg);
+        ALOGE("  idxReg %d", idxReg);
+        ALOGE("  endReg %d", loopAnalysis->endConditionReg);
+        ALOGE("  maxC %d", arrayAccessInfo->maxC);
+        ALOGE("  minC %d", arrayAccessInfo->minC);
+        ALOGE("  opcode %d", loopAnalysis->loopBranchOpcode);
     }
 }
 
@@ -149,7 +149,7 @@ static Opcode negateOpcode(Opcode opcode)
         case OP_IF_LEZ:
             return OP_IF_GTZ;
         default:
-            LOGE("opcode %d cannot be negated", opcode);
+            ALOGE("opcode %d cannot be negated", opcode);
             dvmAbort();
             break;
     }
@@ -391,7 +391,7 @@ static bool doLoopBodyCodeMotion(CompilationUnit *cUnit)
                     break;
                 default:
                     refIdx = 0;
-                    LOGE("Jit: bad case in doLoopBodyCodeMotion");
+                    ALOGE("Jit: bad case in doLoopBodyCodeMotion");
                     dvmCompilerAbort(cUnit);
             }
 
@@ -504,7 +504,7 @@ static void genHoistedChecks(CompilationUnit *cUnit)
                     dvmCompilerAppendMIR(entry, boundCheckMIR);
                 }
             } else {
-                LOGE("Jit: bad case in genHoistedChecks");
+                ALOGE("Jit: bad case in genHoistedChecks");
                 dvmCompilerAbort(cUnit);
             }
         }
diff --git a/vm/compiler/SSATransformation.cpp b/vm/compiler/SSATransformation.cpp
index 542fff55d..7dde59411 100644
--- a/vm/compiler/SSATransformation.cpp
+++ b/vm/compiler/SSATransformation.cpp
@@ -366,7 +366,7 @@ static void computeSuccLiveIn(BitVector *dest,
         dest->storageSize != src2->storageSize ||
         dest->expandable != src1->expandable ||
         dest->expandable != src2->expandable) {
-        LOGE("Incompatible set properties");
+        ALOGE("Incompatible set properties");
         dvmAbort();
     }
 
diff --git a/vm/compiler/Utility.cpp b/vm/compiler/Utility.cpp
index b45530110..2fe94d2e8 100644
--- a/vm/compiler/Utility.cpp
+++ b/vm/compiler/Utility.cpp
@@ -27,7 +27,7 @@ bool dvmCompilerHeapInit(void)
     arenaHead =
         (ArenaMemBlock *) malloc(sizeof(ArenaMemBlock) + ARENA_DEFAULT_SIZE);
     if (arenaHead == NULL) {
-        LOGE("No memory left to create compiler heap memory");
+        ALOGE("No memory left to create compiler heap memory");
         return false;
     }
     arenaHead->blockSize = ARENA_DEFAULT_SIZE;
@@ -69,7 +69,7 @@ retry:
         ArenaMemBlock *newArena = (ArenaMemBlock *)
             malloc(sizeof(ArenaMemBlock) + blockSize);
         if (newArena == NULL) {
-            LOGE("Arena allocation failure");
+            ALOGE("Arena allocation failure");
             dvmAbort();
         }
         newArena->blockSize = blockSize;
@@ -326,7 +326,7 @@ bool dvmCompilerSetBit(BitVector *pBits, unsigned int num)
 bool dvmCompilerClearBit(BitVector *pBits, unsigned int num)
 {
     if (num >= pBits->storageSize * sizeof(u4) * 8) {
-        LOGE("Trying to clear a bit that is not set in the vector yet!");
+        ALOGE("Trying to clear a bit that is not set in the vector yet!");
         dvmAbort();
     }
 
@@ -347,17 +347,17 @@ void dvmDebugBitVector(char *msg, const BitVector *bv, int length)
 {
     int i;
 
-    LOGE("%s", msg);
+    ALOGE("%s", msg);
     for (i = 0; i < length; i++) {
         if (dvmIsBitSet(bv, i)) {
-            LOGE("    Bit %d is set", i);
+            ALOGE("    Bit %d is set", i);
         }
     }
 }
 
 void dvmCompilerAbort(CompilationUnit *cUnit)
 {
-    LOGE("Jit: aborting trace compilation, reverting to interpreter");
+    ALOGE("Jit: aborting trace compilation, reverting to interpreter");
     /* Force a traceback in debug builds */
     assert(0);
     /*
@@ -372,14 +372,14 @@ void dvmDumpBlockBitVector(const GrowableList *blocks, char *msg,
 {
     int i;
 
-    LOGE("%s", msg);
+    ALOGE("%s", msg);
     for (i = 0; i < length; i++) {
         if (dvmIsBitSet(bv, i)) {
             BasicBlock *bb =
                 (BasicBlock *) dvmGrowableListGetElement(blocks, i);
             char blockName[BLOCK_NAME_LEN];
             dvmGetBlockName(bb, blockName);
-            LOGE("Bit %d / %s is set", i, blockName);
+            ALOGE("Bit %d / %s is set", i, blockName);
         }
     }
 }
diff --git a/vm/compiler/codegen/RallocUtil.cpp b/vm/compiler/codegen/RallocUtil.cpp
index 27d1f0597..f4a46f0f9 100644
--- a/vm/compiler/codegen/RallocUtil.cpp
+++ b/vm/compiler/codegen/RallocUtil.cpp
@@ -71,13 +71,13 @@ extern void dvmCompilerInitPool(RegisterInfo *regs, int *regNums, int num)
 static void dumpRegPool(RegisterInfo *p, int numRegs)
 {
     int i;
-    LOGE("================================================");
+    ALOGE("================================================");
     for (i=0; i < numRegs; i++ ){
-        LOGE("R[%d]: U:%d, P:%d, part:%d, LV:%d, D:%d, SR:%d, ST:%x, EN:%x",
+        ALOGE("R[%d]: U:%d, P:%d, part:%d, LV:%d, D:%d, SR:%d, ST:%x, EN:%x",
            p[i].reg, p[i].inUse, p[i].pair, p[i].partner, p[i].live,
            p[i].dirty, p[i].sReg,(int)p[i].defStart, (int)p[i].defEnd);
     }
-    LOGE("================================================");
+    ALOGE("================================================");
 }
 
 static RegisterInfo *getRegInfo(CompilationUnit *cUnit, int reg)
@@ -97,7 +97,7 @@ static RegisterInfo *getRegInfo(CompilationUnit *cUnit, int reg)
             return &p[i];
         }
     }
-    LOGE("Tried to get info on a non-existant temp: r%d",reg);
+    ALOGE("Tried to get info on a non-existant temp: r%d",reg);
     dvmCompilerAbort(cUnit);
     return NULL;
 }
@@ -223,7 +223,7 @@ static int allocTempBody(CompilationUnit *cUnit, RegisterInfo *p, int numTemps,
         next++;
     }
     if (required) {
-        LOGE("No free temp registers");
+        ALOGE("No free temp registers");
         dvmCompilerAbort(cUnit);
     }
     return -1;  // No register available
@@ -272,7 +272,7 @@ extern int dvmCompilerAllocTempDouble(CompilationUnit *cUnit)
         }
         next += 2;
     }
-    LOGE("No free temp registers");
+    ALOGE("No free temp registers");
     dvmCompilerAbort(cUnit);
     return -1;
 }
@@ -333,7 +333,7 @@ static RegisterInfo *allocLive(CompilationUnit *cUnit, int sReg,
                                 cUnit->regPool->numFPTemps, sReg);
             break;
         default:
-            LOGE("Invalid register type");
+            ALOGE("Invalid register type");
             dvmCompilerAbort(cUnit);
     }
     return res;
@@ -360,7 +360,7 @@ extern void dvmCompilerFreeTemp(CompilationUnit *cUnit, int reg)
             return;
         }
     }
-    LOGE("Tried to free a non-existant temp: r%d",reg);
+    ALOGE("Tried to free a non-existant temp: r%d",reg);
     dvmCompilerAbort(cUnit);
 }
 
@@ -430,7 +430,7 @@ extern void dvmCompilerLockTemp(CompilationUnit *cUnit, int reg)
             return;
         }
     }
-    LOGE("Tried to lock a non-existant temp: r%d",reg);
+    ALOGE("Tried to lock a non-existant temp: r%d",reg);
     dvmCompilerAbort(cUnit);
 }
 
diff --git a/vm/compiler/codegen/arm/ArchFactory.cpp b/vm/compiler/codegen/arm/ArchFactory.cpp
index 5a03b17ad..2daa7bcba 100644
--- a/vm/compiler/codegen/arm/ArchFactory.cpp
+++ b/vm/compiler/codegen/arm/ArchFactory.cpp
@@ -40,7 +40,7 @@ static TGT_LIR *genRegImmCheck(CompilationUnit *cUnit,
             branch->generic.target = (LIR *) exceptionLabel;
             return exceptionLabel;
         } else {
-            LOGE("Catch blocks not handled yet");
+            ALOGE("Catch blocks not handled yet");
             dvmAbort();
             return NULL;
         }
diff --git a/vm/compiler/codegen/arm/Assemble.cpp b/vm/compiler/codegen/arm/Assemble.cpp
index 09d2bc18b..9842eaf17 100644
--- a/vm/compiler/codegen/arm/Assemble.cpp
+++ b/vm/compiler/codegen/arm/Assemble.cpp
@@ -958,7 +958,7 @@ static AssemblerStatus assembleInstructions(CompilationUnit *cUnit,
             intptr_t target = lirTarget->generic.offset;
             int delta = target - pc;
             if (delta & 0x3) {
-                LOGE("PC-rel distance is not multiples of 4: %d", delta);
+                ALOGE("PC-rel distance is not multiples of 4: %d", delta);
                 dvmCompilerAbort(cUnit);
             }
             if ((lir->opcode == kThumb2LdrPcRel12) && (delta > 4091)) {
@@ -1035,7 +1035,7 @@ static AssemblerStatus assembleInstructions(CompilationUnit *cUnit,
             intptr_t target = targetLIR->generic.offset;
             int delta = target - pc;
             if (delta > 2046 || delta < -2048) {
-                LOGE("Unconditional branch distance out of range: %d", delta);
+                ALOGE("Unconditional branch distance out of range: %d", delta);
                 dvmCompilerAbort(cUnit);
             }
             lir->operands[0] = delta >> 1;
@@ -1437,7 +1437,7 @@ void dvmCompilerAssembleLIR(CompilationUnit *cUnit, JitTranslationInfo *info)
     /* Allocate enough space for the code block */
     cUnit->codeBuffer = (unsigned char *)dvmCompilerNew(chainCellOffset, true);
     if (cUnit->codeBuffer == NULL) {
-        LOGE("Code buffer allocation failure");
+        ALOGE("Code buffer allocation failure");
         info->discardResult = true;
         return;
     }
@@ -1467,7 +1467,7 @@ void dvmCompilerAssembleLIR(CompilationUnit *cUnit, JitTranslationInfo *info)
         case kRetryHalve:
             return;
         default:
-             LOGE("Unexpected assembler status: %d", cUnit->assemblerStatus);
+             ALOGE("Unexpected assembler status: %d", cUnit->assemblerStatus);
              dvmAbort();
     }
 
@@ -1939,7 +1939,7 @@ static u4* unchainSingle(JitEntry *trace)
                     predChainCell->clazz = PREDICTED_CHAIN_CLAZZ_INIT;
                     break;
                 default:
-                    LOGE("Unexpected chaining type: %d", i);
+                    ALOGE("Unexpected chaining type: %d", i);
                     dvmAbort();  // dvmAbort OK here - can't safely recover
             }
             COMPILER_TRACE_CHAINING(
@@ -2418,7 +2418,7 @@ static int selfVerificationLoad(int addr, int size)
             data = *((u4*) addr);
             break;
         default:
-            LOGE("*** ERROR: BAD SIZE IN selfVerificationLoad: %d", size);
+            ALOGE("*** ERROR: BAD SIZE IN selfVerificationLoad: %d", size);
             data = 0;
             dvmAbort();
     }
@@ -2498,7 +2498,7 @@ static void selfVerificationStore(int addr, int data, int size)
             *((u4*) addr) = data;
             break;
         default:
-            LOGE("*** ERROR: BAD SIZE IN selfVerificationSave: %d", size);
+            ALOGE("*** ERROR: BAD SIZE IN selfVerificationSave: %d", size);
             dvmAbort();
     }
 }
@@ -2712,7 +2712,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp)
                     if (insn & 0x400000) rt |= 0x10;
                     rt = rt << 1;
                 } else {
-                    LOGE("*** ERROR: UNRECOGNIZED VECTOR MEM OP: %x", opcode4);
+                    ALOGE("*** ERROR: UNRECOGNIZED VECTOR MEM OP: %x", opcode4);
                     dvmAbort();
                 }
                 rt += 14;
@@ -2745,7 +2745,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp)
                 offset = 0;
                 break;
             default:
-                LOGE("*** ERROR: UNRECOGNIZED THUMB2 MEM OP: %x", opcode12);
+                ALOGE("*** ERROR: UNRECOGNIZED THUMB2 MEM OP: %x", opcode12);
                 offset = 0;
                 dvmAbort();
         }
@@ -2895,7 +2895,7 @@ void dvmSelfVerificationMemOpDecode(int lr, int* sp)
                 offset = 0;
                 break;
             default:
-                LOGE("*** ERROR: UNRECOGNIZED THUMB MEM OP: %x", opcode5);
+                ALOGE("*** ERROR: UNRECOGNIZED THUMB MEM OP: %x", opcode5);
                 offset = 0;
                 dvmAbort();
         }
diff --git a/vm/compiler/codegen/arm/CodegenCommon.cpp b/vm/compiler/codegen/arm/CodegenCommon.cpp
index ae41fe9af..07f3ac765 100644
--- a/vm/compiler/codegen/arm/CodegenCommon.cpp
+++ b/vm/compiler/codegen/arm/CodegenCommon.cpp
@@ -62,7 +62,7 @@ static void setMemRefType(ArmLIR *lir, bool isLoad, int memType)
             *maskPtr |= ENCODE_MUST_NOT_ALIAS;
             break;
         default:
-            LOGE("Jit: invalid memref kind - %d", memType);
+            ALOGE("Jit: invalid memref kind - %d", memType);
             assert(0);  // Bail if debug build, set worst-case in the field
             *maskPtr |= ENCODE_ALL;
     }
@@ -302,7 +302,7 @@ static ArmLIR *newLIR3(CompilationUnit *cUnit, ArmOpcode opcode,
 {
     ArmLIR *insn = (ArmLIR *) dvmCompilerNew(sizeof(ArmLIR), true);
     if (!(EncodingMap[opcode].flags & IS_TERTIARY_OP)) {
-        LOGE("Bad LIR3: %s[%d]",EncodingMap[opcode].name,opcode);
+        ALOGE("Bad LIR3: %s[%d]",EncodingMap[opcode].name,opcode);
     }
     assert(isPseudoOpcode(opcode) ||
            (EncodingMap[opcode].flags & IS_TERTIARY_OP));
diff --git a/vm/compiler/codegen/arm/CodegenDriver.cpp b/vm/compiler/codegen/arm/CodegenDriver.cpp
index 57fd38808..d7017b0fe 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.cpp
+++ b/vm/compiler/codegen/arm/CodegenDriver.cpp
@@ -738,7 +738,7 @@ static bool genArithOpLong(CompilationUnit *cUnit, MIR *mir,
             return false;
         }
         default:
-            LOGE("Invalid long arith op");
+            ALOGE("Invalid long arith op");
             dvmCompilerAbort(cUnit);
     }
     if (!callOut) {
@@ -840,7 +840,7 @@ static bool genArithOpInt(CompilationUnit *cUnit, MIR *mir,
             op = kOpLsr;
             break;
         default:
-            LOGE("Invalid word arith op: %#x(%d)",
+            ALOGE("Invalid word arith op: %#x(%d)",
                  mir->dalvikInsn.opcode, mir->dalvikInsn.opcode);
             dvmCompilerAbort(cUnit);
     }
@@ -1477,7 +1477,7 @@ static bool handleFmt10x(CompilationUnit *cUnit, MIR *mir)
 {
     Opcode dalvikOpcode = mir->dalvikInsn.opcode;
     if ((dalvikOpcode >= OP_UNUSED_3E) && (dalvikOpcode <= OP_UNUSED_43)) {
-        LOGE("Codegen: got unused opcode %#x",dalvikOpcode);
+        ALOGE("Codegen: got unused opcode %#x",dalvikOpcode);
         return true;
     }
     switch (dalvikOpcode) {
@@ -1491,7 +1491,7 @@ static bool handleFmt10x(CompilationUnit *cUnit, MIR *mir)
         case OP_UNUSED_79:
         case OP_UNUSED_7A:
         case OP_UNUSED_FF:
-            LOGE("Codegen: got unused opcode %#x",dalvikOpcode);
+            ALOGE("Codegen: got unused opcode %#x",dalvikOpcode);
             return true;
         case OP_NOP:
             break;
@@ -1586,7 +1586,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
 
             if (strPtr == NULL) {
                 BAIL_LOOP_COMPILATION();
-                LOGE("Unexpected null string");
+                ALOGE("Unexpected null string");
                 dvmAbort();
             }
 
@@ -1602,7 +1602,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
 
             if (classPtr == NULL) {
                 BAIL_LOOP_COMPILATION();
-                LOGE("Unexpected null class");
+                ALOGE("Unexpected null class");
                 dvmAbort();
             }
 
@@ -1630,7 +1630,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
 
             if (fieldPtr == NULL) {
                 BAIL_LOOP_COMPILATION();
-                LOGE("Unexpected null static field");
+                ALOGE("Unexpected null static field");
                 dvmAbort();
             }
 
@@ -1674,7 +1674,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
 
             if (fieldPtr == NULL) {
                 BAIL_LOOP_COMPILATION();
-                LOGE("Unexpected null static field");
+                ALOGE("Unexpected null static field");
                 dvmAbort();
             }
 
@@ -1711,7 +1711,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
 
             if (fieldPtr == NULL) {
                 BAIL_LOOP_COMPILATION();
-                LOGE("Unexpected null static field");
+                ALOGE("Unexpected null static field");
                 dvmAbort();
             }
 
@@ -1761,7 +1761,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
 
             if (fieldPtr == NULL) {
                 BAIL_LOOP_COMPILATION();
-                LOGE("Unexpected null static field");
+                ALOGE("Unexpected null static field");
                 dvmAbort();
             }
 
@@ -1784,7 +1784,7 @@ static bool handleFmt21c_Fmt31c(CompilationUnit *cUnit, MIR *mir)
 
             if (classPtr == NULL) {
                 BAIL_LOOP_COMPILATION();
-                LOGE("Unexpected null class");
+                ALOGE("Unexpected null class");
                 dvmAbort();
             }
 
@@ -2129,7 +2129,7 @@ static bool handleFmt21t(CompilationUnit *cUnit, MIR *mir, BasicBlock *bb,
             break;
         default:
             cond = (ArmConditionCode)0;
-            LOGE("Unexpected opcode (%d) for Fmt21t", dalvikOpcode);
+            ALOGE("Unexpected opcode (%d) for Fmt21t", dalvikOpcode);
             dvmCompilerAbort(cUnit);
     }
     genConditionalBranch(cUnit, cond, &labelList[bb->taken->id]);
@@ -2416,7 +2416,7 @@ static bool handleFmt22c(CompilationUnit *cUnit, MIR *mir)
 
             if (fieldPtr == NULL) {
                 BAIL_LOOP_COMPILATION();
-                LOGE("Unexpected null instance field");
+                ALOGE("Unexpected null instance field");
                 dvmAbort();
             }
 
@@ -2443,7 +2443,7 @@ static bool handleFmt22c(CompilationUnit *cUnit, MIR *mir)
 
             if (classPtr == NULL) {
                 BAIL_LOOP_COMPILATION();
-                LOGE("Unexpected null class");
+                ALOGE("Unexpected null class");
                 dvmAbort();
             }
 
@@ -2632,7 +2632,7 @@ static bool handleFmt22t(CompilationUnit *cUnit, MIR *mir, BasicBlock *bb,
             break;
         default:
             cond = (ArmConditionCode)0;
-            LOGE("Unexpected opcode (%d) for Fmt22t", dalvikOpcode);
+            ALOGE("Unexpected opcode (%d) for Fmt22t", dalvikOpcode);
             dvmCompilerAbort(cUnit);
     }
     genConditionalBranch(cUnit, cond, &labelList[bb->taken->id]);
@@ -4465,7 +4465,7 @@ void dvmCompilerMIR2LIR(CompilationUnit *cUnit)
                     }
                 }
                 if (notHandled) {
-                    LOGE("%#06x: Opcode %#x (%s) / Fmt %d not handled",
+                    ALOGE("%#06x: Opcode %#x (%s) / Fmt %d not handled",
                          mir->offset,
                          dalvikOpcode, dexGetOpcodeName(dalvikOpcode),
                          dalvikFormat);
@@ -4549,7 +4549,7 @@ gen_fallthrough:
                         chainingBlock->startOffset);
                     break;
                 default:
-                    LOGE("Bad blocktype %d", chainingBlock->blockType);
+                    ALOGE("Bad blocktype %d", chainingBlock->blockType);
                     dvmCompilerAbort(cUnit);
             }
         }
@@ -4620,7 +4620,7 @@ bool dvmCompilerDoWork(CompilerWorkOrder *work)
             break;
         default:
             isCompile = false;
-            LOGE("Jit: unknown work order type");
+            ALOGE("Jit: unknown work order type");
             assert(0);  // Bail if debug build, discard otherwise
     }
     if (!success)
@@ -4681,7 +4681,7 @@ bool dvmCompilerArchInit()
 
     for (i = 0; i < kArmLast; i++) {
         if (EncodingMap[i].opcode != i) {
-            LOGE("Encoding order for %s is wrong: expecting %d, seeing %d",
+            ALOGE("Encoding order for %s is wrong: expecting %d, seeing %d",
                  EncodingMap[i].name, i, EncodingMap[i].opcode);
             dvmAbort();  // OK to dvmAbort - build error
         }
diff --git a/vm/compiler/codegen/arm/Thumb/Factory.cpp b/vm/compiler/codegen/arm/Thumb/Factory.cpp
index 9cdd75f46..1b65a03ac 100644
--- a/vm/compiler/codegen/arm/Thumb/Factory.cpp
+++ b/vm/compiler/codegen/arm/Thumb/Factory.cpp
@@ -148,7 +148,7 @@ static ArmLIR *opNone(CompilationUnit *cUnit, OpKind op)
             opcode = kThumbBUncond;
             break;
         default:
-            LOGE("Jit: bad case in opNone");
+            ALOGE("Jit: bad case in opNone");
             dvmCompilerAbort(cUnit);
     }
     return newLIR0(cUnit, opcode);
@@ -170,7 +170,7 @@ static ArmLIR *opImm(CompilationUnit *cUnit, OpKind op, int value)
             opcode = kThumbPop;
             break;
         default:
-            LOGE("Jit: bad case in opCondBranch");
+            ALOGE("Jit: bad case in opCondBranch");
             dvmCompilerAbort(cUnit);
     }
     return newLIR1(cUnit, opcode, value);
@@ -184,7 +184,7 @@ static ArmLIR *opReg(CompilationUnit *cUnit, OpKind op, int rDestSrc)
             opcode = kThumbBlxR;
             break;
         default:
-            LOGE("Jit: bad case in opReg");
+            ALOGE("Jit: bad case in opReg");
             dvmCompilerAbort(cUnit);
     }
     return newLIR1(cUnit, opcode, rDestSrc);
@@ -230,7 +230,7 @@ static ArmLIR *opRegImm(CompilationUnit *cUnit, OpKind op, int rDestSrc1,
             }
             break;
         default:
-            LOGE("Jit: bad case in opRegImm");
+            ALOGE("Jit: bad case in opRegImm");
             dvmCompilerAbort(cUnit);
             break;
     }
@@ -351,7 +351,7 @@ static ArmLIR *opRegRegImm(CompilationUnit *cUnit, OpKind op, int rDest,
                 }
                 return res;
         default:
-            LOGE("Jit: bad case in opRegRegImm");
+            ALOGE("Jit: bad case in opRegRegImm");
             dvmCompilerAbort(cUnit);
             break;
     }
@@ -449,7 +449,7 @@ static ArmLIR *opRegReg(CompilationUnit *cUnit, OpKind op, int rDestSrc1,
              opRegRegImm(cUnit, kOpLsr, rDestSrc1, rDestSrc1, 16);
              return res;
         default:
-            LOGE("Jit: bad case in opRegReg");
+            ALOGE("Jit: bad case in opRegReg");
             dvmCompilerAbort(cUnit);
             break;
     }
@@ -495,7 +495,7 @@ static ArmLIR *loadBaseIndexed(CompilationUnit *cUnit, int rBase,
             opcode = kThumbLdrsbRRR;
             break;
         default:
-            LOGE("Jit: bad case in loadBaseIndexed");
+            ALOGE("Jit: bad case in loadBaseIndexed");
             dvmCompilerAbort(cUnit);
     }
     res = newLIR3(cUnit, opcode, rDest, rBase, rNewIndex);
@@ -533,7 +533,7 @@ static ArmLIR *storeBaseIndexed(CompilationUnit *cUnit, int rBase,
             opcode = kThumbStrbRRR;
             break;
         default:
-            LOGE("Jit: bad case in storeBaseIndexed");
+            ALOGE("Jit: bad case in storeBaseIndexed");
             dvmCompilerAbort(cUnit);
     }
     res = newLIR3(cUnit, opcode, rSrc, rBase, rNewIndex);
@@ -650,7 +650,7 @@ static ArmLIR *loadBaseDispBody(CompilationUnit *cUnit, MIR *mir, int rBase,
             opcode = kThumbLdrsbRRR;
             break;
         default:
-            LOGE("Jit: bad case in loadBaseIndexedBody");
+            ALOGE("Jit: bad case in loadBaseIndexedBody");
             dvmCompilerAbort(cUnit);
     }
     if (shortForm) {
@@ -767,7 +767,7 @@ static ArmLIR *storeBaseDispBody(CompilationUnit *cUnit, int rBase,
             }
             break;
         default:
-            LOGE("Jit: bad case in storeBaseIndexedBody");
+            ALOGE("Jit: bad case in storeBaseIndexedBody");
             dvmCompilerAbort(cUnit);
     }
     if (shortForm) {
diff --git a/vm/compiler/codegen/arm/Thumb2/Gen.cpp b/vm/compiler/codegen/arm/Thumb2/Gen.cpp
index fcf0fe34c..ea6454779 100644
--- a/vm/compiler/codegen/arm/Thumb2/Gen.cpp
+++ b/vm/compiler/codegen/arm/Thumb2/Gen.cpp
@@ -186,7 +186,7 @@ static ArmLIR *genIT(CompilationUnit *cUnit, ArmConditionCode code,
         case 0:
             break;
         default:
-            LOGE("Jit: bad case in genIT");
+            ALOGE("Jit: bad case in genIT");
             dvmCompilerAbort(cUnit);
     }
     mask = (mask3 << 3) | (mask2 << 2) | (mask1 << 1) |
diff --git a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp
index 5188417c9..3b5c08332 100644
--- a/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp
+++ b/vm/compiler/codegen/arm/armv5te-vfp/ArchVariant.cpp
@@ -77,7 +77,7 @@ bool dvmCompilerArchVariantInit(void)
      */
     if ((offsetof(Thread, jitToInterpEntries) +
          sizeof(struct JitToInterpEntries)) >= 128) {
-        LOGE("Thread.jitToInterpEntries size overflow");
+        ALOGE("Thread.jitToInterpEntries size overflow");
         dvmAbort();
     }
 
@@ -98,7 +98,7 @@ int dvmCompilerTargetOptHint(int key)
             res = 2;
             break;
         default:
-            LOGE("Unknown target optimization hint key: %d",key);
+            ALOGE("Unknown target optimization hint key: %d",key);
             res = 0;
     }
     return res;
diff --git a/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp b/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp
index f394aa1c8..f2d4815ac 100644
--- a/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp
+++ b/vm/compiler/codegen/arm/armv5te/ArchVariant.cpp
@@ -77,7 +77,7 @@ bool dvmCompilerArchVariantInit(void)
      */
     if ((offsetof(Thread, jitToInterpEntries) +
          sizeof(struct JitToInterpEntries)) >= 128) {
-        LOGE("Thread.jitToInterpEntries size overflow");
+        ALOGE("Thread.jitToInterpEntries size overflow");
         dvmAbort();
     }
 
@@ -98,7 +98,7 @@ int dvmCompilerTargetOptHint(int key)
             res = 2;
             break;
         default:
-            LOGE("Unknown target optimization hint key: %d",key);
+            ALOGE("Unknown target optimization hint key: %d",key);
             res = 0;
     }
     return res;
diff --git a/vm/compiler/codegen/arm/armv5te/MethodCodegenDriver.cpp b/vm/compiler/codegen/arm/armv5te/MethodCodegenDriver.cpp
index 20779f3e9..a0dba0a56 100644
--- a/vm/compiler/codegen/arm/armv5te/MethodCodegenDriver.cpp
+++ b/vm/compiler/codegen/arm/armv5te/MethodCodegenDriver.cpp
@@ -16,6 +16,6 @@
 
 void dvmCompilerMethodMIR2LIR(CompilationUnit *cUnit)
 {
-    LOGE("Method-based JIT not supported for the v5te target");
+    ALOGE("Method-based JIT not supported for the v5te target");
     dvmAbort();
 }
diff --git a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp
index c3fe518e0..e3b27243c 100644
--- a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp
+++ b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp
@@ -72,7 +72,7 @@ bool dvmCompilerArchVariantInit(void)
      */
     if ((offsetof(Thread, jitToInterpEntries) +
          sizeof(struct JitToInterpEntries)) >= 128) {
-        LOGE("Thread.jitToInterpEntries size overflow");
+        ALOGE("Thread.jitToInterpEntries size overflow");
         dvmAbort();
     }
 
@@ -93,7 +93,7 @@ int dvmCompilerTargetOptHint(int key)
             res = 7;
             break;
         default:
-            LOGE("Unknown target optimization hint key: %d",key);
+            ALOGE("Unknown target optimization hint key: %d",key);
             res = 0;
     }
     return res;
diff --git a/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp b/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
index 8df16c6d1..222b88044 100644
--- a/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
+++ b/vm/compiler/codegen/arm/armv7-a-neon/MethodCodegenDriver.cpp
@@ -395,7 +395,7 @@ static bool methodBlockCodeGen(CompilationUnit *cUnit, BasicBlock *bb)
         }
 
         if (notHandled) {
-            LOGE("%#06x: Opcode %#x (%s) / Fmt %d not handled",
+            ALOGE("%#06x: Opcode %#x (%s) / Fmt %d not handled",
                  mir->offset,
                  dalvikOpcode, dexGetOpcodeName(dalvikOpcode),
                  dalvikFormat);
diff --git a/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp b/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp
index c3fe518e0..e3b27243c 100644
--- a/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp
+++ b/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp
@@ -72,7 +72,7 @@ bool dvmCompilerArchVariantInit(void)
      */
     if ((offsetof(Thread, jitToInterpEntries) +
          sizeof(struct JitToInterpEntries)) >= 128) {
-        LOGE("Thread.jitToInterpEntries size overflow");
+        ALOGE("Thread.jitToInterpEntries size overflow");
         dvmAbort();
     }
 
@@ -93,7 +93,7 @@ int dvmCompilerTargetOptHint(int key)
             res = 7;
             break;
         default:
-            LOGE("Unknown target optimization hint key: %d",key);
+            ALOGE("Unknown target optimization hint key: %d",key);
             res = 0;
     }
     return res;
diff --git a/vm/compiler/codegen/x86/CodegenDriver.cpp b/vm/compiler/codegen/x86/CodegenDriver.cpp
index 789d4317e..9c7bf1eab 100644
--- a/vm/compiler/codegen/x86/CodegenDriver.cpp
+++ b/vm/compiler/codegen/x86/CodegenDriver.cpp
@@ -239,7 +239,7 @@ bool dvmCompilerDoWork(CompilerWorkOrder *work)
         }
         default:
             res = false;
-            LOGE("Jit: unknown work order type");
+            ALOGE("Jit: unknown work order type");
             assert(0);  // Bail if debug build, discard otherwise
     }
     return res;
diff --git a/vm/compiler/codegen/x86/ia32/ArchVariant.cpp b/vm/compiler/codegen/x86/ia32/ArchVariant.cpp
index 9f17522a5..ff97d9527 100644
--- a/vm/compiler/codegen/x86/ia32/ArchVariant.cpp
+++ b/vm/compiler/codegen/x86/ia32/ArchVariant.cpp
@@ -91,7 +91,7 @@ int dvmCompilerTargetOptHint(int key)
             res = 2;
             break;
         default:
-            LOGE("Unknown target optimization hint key: %d",key);
+            ALOGE("Unknown target optimization hint key: %d",key);
             res = 0;
     }
     return res;