Fix debug statements.

Shows up without NDEBUG.

Change-Id: I1270266369beb783242283af60ee268118c8fb3d

diff --git a/dexopt/OptMain.c b/dexopt/OptMain.c
index b8e5889..194a62b 100644 (file)
--- a/dexopt/OptMain.c
+++ b/dexopt/OptMain.c
@@ -238,7 +238,7 @@ static int processZipFile(int zipFd, int cacheFd, const char* zipName,
         if (matchOffset > 0 && bcp[matchOffset-1] == ':')
             matchOffset--;
         LOGV("DexOptZ: found '%s' in bootclasspath, cutting off at %d\n",
-            inputFileName, matchOffset);
+            zipName, matchOffset);
         bcpCopy = strdup(bcp);
         bcpCopy[matchOffset] = '\0';
 

diff --git a/vm/Sync.c b/vm/Sync.c
index 50a7a5e..67263a6 100644 (file)
--- a/vm/Sync.c
+++ b/vm/Sync.c
@@ -1249,8 +1249,7 @@ void dvmObjectWait(Thread* self, Object *obj, s8 msec, s4 nsec,
          * any other thread gets a chance.
          */
         inflateMonitor(self, obj);
-        LOG_THIN("(%d) lock %p fattened by wait() to count %d",
-                 self->threadId, &obj->lock, mon->lockCount);
+        LOG_THIN("(%d) lock %p fattened by wait()", self->threadId, &obj->lock);
     }
     mon = LW_MONITOR(obj->lock);
     waitMonitor(self, mon, msec, nsec, interruptShouldThrow);

diff --git a/vm/analysis/DexPrepare.c b/vm/analysis/DexPrepare.c
index 7a9f283..51c4b9a 100644 (file)
--- a/vm/analysis/DexPrepare.c
+++ b/vm/analysis/DexPrepare.c
@@ -480,8 +480,7 @@ bool dvmContinueOptimization(int fd, off_t dexOffset, long dexLength,
 
     assert(gDvm.optimizing);
 
-    LOGV("Continuing optimization (%s, isb=%d, vfy=%d, opt=%d)\n",
-        fileName, isBootstrap, doVerify, doOpt);
+    LOGV("Continuing optimization (%s, isb=%d)\n", fileName, isBootstrap);
 
     assert(dexOffset >= 0);