Move logging.h into base/logging.h.
Change-Id: Id68f85f7c3a71b156cb40dec63f94d4fb827f279
diff --git a/src/compiler_llvm/backend_types.h b/src/compiler_llvm/backend_types.h
index ae226d6..14b8a66 100644
--- a/src/compiler_llvm/backend_types.h
+++ b/src/compiler_llvm/backend_types.h
@@ -17,7 +17,7 @@
#ifndef ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_
#define ART_SRC_COMPILER_LLVM_BACKEND_TYPES_H_
-#include "logging.h"
+#include "base/logging.h"
namespace art {
diff --git a/src/compiler_llvm/compilation_unit.cc b/src/compiler_llvm/compilation_unit.cc
index b482d00..596169b 100644
--- a/src/compiler_llvm/compilation_unit.cc
+++ b/src/compiler_llvm/compilation_unit.cc
@@ -16,11 +16,11 @@
#include "compilation_unit.h"
+#include "base/logging.h"
#include "compiled_method.h"
#include "compiler_llvm.h"
#include "instruction_set.h"
#include "ir_builder.h"
-#include "logging.h"
#include "os.h"
#include "runtime_support_builder_arm.h"
diff --git a/src/compiler_llvm/compilation_unit.h b/src/compiler_llvm/compilation_unit.h
index 5fb0c0c..591d4f0 100644
--- a/src/compiler_llvm/compilation_unit.h
+++ b/src/compiler_llvm/compilation_unit.h
@@ -17,13 +17,13 @@
#ifndef ART_SRC_COMPILER_LLVM_COMPILATION_UNIT_H_
#define ART_SRC_COMPILER_LLVM_COMPILATION_UNIT_H_
+#include "base/logging.h"
#include "base/mutex.h"
#include "globals.h"
#if defined(ART_USE_DEXLANG_FRONTEND)
# include "greenland/dex_lang.h"
#endif
#include "instruction_set.h"
-#include "logging.h"
#include "runtime_support_builder.h"
#include "runtime_support_func.h"
#include "safe_map.h"
diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler_llvm/jni_compiler.cc
index 2a17320..da55d94 100644
--- a/src/compiler_llvm/jni_compiler.cc
+++ b/src/compiler_llvm/jni_compiler.cc
@@ -16,13 +16,13 @@
#include "jni_compiler.h"
+#include "base/logging.h"
#include "class_linker.h"
#include "compilation_unit.h"
#include "compiled_method.h"
#include "compiler.h"
#include "compiler_llvm.h"
#include "ir_builder.h"
-#include "logging.h"
#include "oat_compilation_unit.h"
#include "object.h"
#include "runtime.h"
diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 68121de..d989728 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -17,12 +17,12 @@
#include "method_compiler.h"
#include "backend_types.h"
+#include "base/logging.h"
#include "compilation_unit.h"
#include "compiler.h"
#include "dalvik_reg.h"
#include "greenland/inferred_reg_category_map.h"
#include "ir_builder.h"
-#include "logging.h"
#include "oat_compilation_unit.h"
#include "object.h"
#include "object_utils.h"
diff --git a/src/compiler_llvm/procedure_linkage_table.cc b/src/compiler_llvm/procedure_linkage_table.cc
index cb4a9ed..51d6cd2 100644
--- a/src/compiler_llvm/procedure_linkage_table.cc
+++ b/src/compiler_llvm/procedure_linkage_table.cc
@@ -16,10 +16,10 @@
#include "procedure_linkage_table.h"
+#include "base/logging.h"
#include "compiler_runtime_func_list.h"
#include "globals.h"
#include "instruction_set.h"
-#include "logging.h"
#include "runtime_support_func_list.h"
#include "runtime_support_llvm.h"
#include "utils_llvm.h"
diff --git a/src/compiler_llvm/runtime_support_builder.h b/src/compiler_llvm/runtime_support_builder.h
index 58f01f6..7c11702 100644
--- a/src/compiler_llvm/runtime_support_builder.h
+++ b/src/compiler_llvm/runtime_support_builder.h
@@ -18,7 +18,7 @@
#define ART_SRC_COMPILER_LLVM_RUNTIME_SUPPORT_BUILDER_H_
#include "backend_types.h"
-#include "logging.h"
+#include "base/logging.h"
#include "runtime_support_func.h"
#include <stdint.h>
diff --git a/src/compiler_llvm/stub_compiler.cc b/src/compiler_llvm/stub_compiler.cc
index 4571f58..d03400f 100644
--- a/src/compiler_llvm/stub_compiler.cc
+++ b/src/compiler_llvm/stub_compiler.cc
@@ -16,12 +16,12 @@
#include "stub_compiler.h"
+#include "base/logging.h"
#include "compilation_unit.h"
#include "compiled_method.h"
#include "compiler.h"
#include "compiler_llvm.h"
#include "ir_builder.h"
-#include "logging.h"
#include "object.h"
#include "runtime_support_func.h"
#include "utils_llvm.h"