commit 15bf2d34efa2218e287b584fb3653d268b9edc8d
author Ian Rogers <irogers@google.com> Tue Aug 28 17:33:04 2012 -0700
committer Ian Rogers <irogers@google.com> Thu Aug 30 17:22:52 2012 -0700
tree 4435664bd2c9a041d8c355940f2b5c95e03d38f7
parent e4f0b2ab4abd8e942a099e9b9b4682fbdd9eb21c

Use bionic's dlmalloc 2.8.5.

Also fix free space computations for DDMS.

Change-Id: Icbc045b5461af89a0516f37f01acaaa815205348

src/mutex.h

diff --git a/src/mutex.h b/src/mutex.h
index 6947a89..be3704c 100644
--- a/src/mutex.h
+++ b/src/mutex.h
@@ -51,13 +51,15 @@
   kThreadSuspendCountLock = 2,
   kAbortLock = 3,
   kDefaultMutexLevel = 4,
-  kLoadLibraryLock = 5,
-  kClassLinkerClassesLock = 6,
-  kThreadListLock = 7,
-  kHeapBitmapLock = 8,
-  kMonitorLock = 9,
-  kMutatorLock = 10,
-  kZygoteCreationLock = 11,
+  kJdwpSerialLock = 5,
+  kAllocSpaceLock = 6,
+  kLoadLibraryLock = 7,
+  kClassLinkerClassesLock = 8,
+  kThreadListLock = 9,
+  kHeapBitmapLock = 10,
+  kMonitorLock = 11,
+  kMutatorLock = 12,
+  kZygoteCreationLock = 13,
   kMaxMutexLevel = kMutatorLock,
 };
 std::ostream& operator<<(std::ostream& os, const MutexLevel& rhs);