Various bits of cleanup.
Most notable: PrettyField now includes the type (but, like PrettyMethod,
lets you turn this off), and there's a new PrettyClass, and PrettyType
has been renamed to PrettyTypeOf.
I've also moved the dalvik "sync" stuff into files named "monitor", and
made some of the implementation details private.
Change-Id: I39ea79b45e173f9ebbf9878bcead207766a5653f
diff --git a/src/class_linker.cc b/src/class_linker.cc
index b9c6ed8..e3b4eea 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -7,7 +7,6 @@
#include <utility>
#include <vector>
-#include "UniquePtr.h"
#include "casts.h"
#include "class_loader.h"
#include "dex_cache.h"
@@ -16,11 +15,12 @@
#include "heap.h"
#include "intern_table.h"
#include "logging.h"
+#include "monitor.h"
#include "object.h"
#include "runtime.h"
#include "space.h"
-#include "sync.h"
#include "thread.h"
+#include "UniquePtr.h"
#include "utils.h"
namespace art {
@@ -1222,7 +1222,7 @@
klass->GetStatus() == Class::kStatusVerified ||
klass->GetStatus() == Class::kStatusInitializing ||
klass->GetStatus() == Class::kStatusError)
- << PrettyDescriptor(klass->GetDescriptor()) << " is " << klass->GetStatus();
+ << PrettyClass(klass) << " is " << klass->GetStatus();
Thread* self = Thread::Current();