Move logging.h into base/logging.h.
Change-Id: Id68f85f7c3a71b156cb40dec63f94d4fb827f279
diff --git a/src/gc/atomic_stack.h b/src/gc/atomic_stack.h
index 4a7920e..8de5e35 100644
--- a/src/gc/atomic_stack.h
+++ b/src/gc/atomic_stack.h
@@ -20,9 +20,9 @@
#include <string>
#include "atomic_integer.h"
+#include "base/logging.h"
#include "base/macros.h"
#include "UniquePtr.h"
-#include "logging.h"
#include "mem_map.h"
#include "utils.h"
diff --git a/src/gc/card_table.cc b/src/gc/card_table.cc
index 1e978b5..f27777b 100644
--- a/src/gc/card_table.cc
+++ b/src/gc/card_table.cc
@@ -18,9 +18,9 @@
#include <dynamic_annotations.h>
+#include "base/logging.h"
#include "heap.h"
#include "heap_bitmap.h"
-#include "logging.h"
#include "runtime.h"
#include "space.h"
#include "utils.h"
diff --git a/src/gc/card_table.h b/src/gc/card_table.h
index 5b38ae5..8f1bc92 100644
--- a/src/gc/card_table.h
+++ b/src/gc/card_table.h
@@ -17,8 +17,8 @@
#ifndef ART_SRC_GC_CARDTABLE_H_
#define ART_SRC_GC_CARDTABLE_H_
+#include "base/logging.h"
#include "globals.h"
-#include "logging.h"
#include "mem_map.h"
#include "space_bitmap.h"
#include "UniquePtr.h"
diff --git a/src/gc/large_object_space.cc b/src/gc/large_object_space.cc
index a994479..0247e8d 100644
--- a/src/gc/large_object_space.cc
+++ b/src/gc/large_object_space.cc
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+#include "base/logging.h"
#include "large_object_space.h"
#include "UniquePtr.h"
#include "dlmalloc.h"
#include "image.h"
-#include "logging.h"
#include "os.h"
#include "space_bitmap.h"
#include "stl_util.h"
diff --git a/src/gc/mark_sweep.cc b/src/gc/mark_sweep.cc
index f57d615..7c52c83 100644
--- a/src/gc/mark_sweep.cc
+++ b/src/gc/mark_sweep.cc
@@ -22,6 +22,7 @@
#include <vector>
#include "barrier.h"
+#include "base/logging.h"
#include "base/macros.h"
#include "card_table.h"
#include "class_loader.h"
@@ -31,7 +32,6 @@
#include "intern_table.h"
#include "jni_internal.h"
#include "large_object_space.h"
-#include "logging.h"
#include "monitor.h"
#include "object.h"
#include "runtime.h"
diff --git a/src/gc/space.cc b/src/gc/space.cc
index 27f78cc..bf25358 100644
--- a/src/gc/space.cc
+++ b/src/gc/space.cc
@@ -17,10 +17,10 @@
#include "space.h"
#include "UniquePtr.h"
+#include "base/logging.h"
#include "base/unix_file/fd_file.h"
#include "dlmalloc.h"
#include "image.h"
-#include "logging.h"
#include "os.h"
#include "space_bitmap.h"
#include "stl_util.h"
diff --git a/src/gc/space_bitmap.cc b/src/gc/space_bitmap.cc
index 273ae4f..25fa672 100644
--- a/src/gc/space_bitmap.cc
+++ b/src/gc/space_bitmap.cc
@@ -16,7 +16,7 @@
#include "heap_bitmap.h"
-#include "logging.h"
+#include "base/logging.h"
#include "UniquePtr.h"
#include "utils.h"
diff --git a/src/gc/space_bitmap.h b/src/gc/space_bitmap.h
index 8bd75d5..dd2f47d 100644
--- a/src/gc/space_bitmap.h
+++ b/src/gc/space_bitmap.h
@@ -22,11 +22,11 @@
#include <stdint.h>
#include <vector>
+#include "base/logging.h"
#include "cutils/atomic.h"
#include "cutils/atomic-inline.h"
#include "UniquePtr.h"
#include "globals.h"
-#include "logging.h"
#include "mem_map.h"
#include "utils.h"