Move logging.h into base/logging.h.
Change-Id: Id68f85f7c3a71b156cb40dec63f94d4fb827f279
diff --git a/src/native/dalvik_system_DexFile.cc b/src/native/dalvik_system_DexFile.cc
index fca9bf7..a6a5c98 100644
--- a/src/native/dalvik_system_DexFile.cc
+++ b/src/native/dalvik_system_DexFile.cc
@@ -16,18 +16,18 @@
#include <unistd.h>
+#include "base/logging.h"
#include "class_linker.h"
#include "class_loader.h"
#include "dex_file.h"
+#include "gc/space.h"
#include "image.h"
#include "jni_internal.h"
-#include "logging.h"
#include "os.h"
#include "runtime.h"
#include "scoped_thread_state_change.h"
#include "ScopedLocalRef.h"
#include "ScopedUtfChars.h"
-#include "gc/space.h"
#include "toStringArray.h"
#include "zip_archive.h"
diff --git a/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc b/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
index fe95746..d7cd18d 100644
--- a/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
+++ b/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
@@ -14,8 +14,8 @@
* limitations under the License.
*/
+#include "base/logging.h"
#include "debugger.h"
-#include "logging.h"
#include "scoped_thread_state_change.h"
#include "ScopedPrimitiveArray.h"
diff --git a/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc b/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
index cbf6400..a6588b4 100644
--- a/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
+++ b/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
@@ -14,10 +14,10 @@
* limitations under the License.
*/
+#include "base/logging.h"
#include "base/mutex.h"
#include "debugger.h"
#include "jni_internal.h"
-#include "logging.h"
#include "scoped_thread_state_change.h"
#include "ScopedLocalRef.h"
#include "ScopedPrimitiveArray.h"