Move logging.h into base/logging.h.
Change-Id: Id68f85f7c3a71b156cb40dec63f94d4fb827f279
diff --git a/src/jdwp/jdwp_adb.cc b/src/jdwp/jdwp_adb.cc
index a1d0acf..5cf8f3f 100644
--- a/src/jdwp/jdwp_adb.cc
+++ b/src/jdwp/jdwp_adb.cc
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-#include "logging.h"
-#include "jdwp/jdwp_priv.h"
-#include "jdwp/jdwp_handler.h"
-#include "stringprintf.h"
-
#include <errno.h>
#include <stdio.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <unistd.h>
+#include "base/logging.h"
+#include "jdwp/jdwp_handler.h"
+#include "jdwp/jdwp_priv.h"
+#include "stringprintf.h"
+
#ifdef HAVE_ANDROID_OS
#include "cutils/sockets.h"
#endif
diff --git a/src/jdwp/jdwp_event.cc b/src/jdwp/jdwp_event.cc
index de6a235..20d7cde 100644
--- a/src/jdwp/jdwp_event.cc
+++ b/src/jdwp/jdwp_event.cc
@@ -13,23 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * Send events to the debugger.
- */
-#include "debugger.h"
-#include "jdwp/jdwp_priv.h"
-#include "jdwp/jdwp_constants.h"
-#include "jdwp/jdwp_handler.h"
-#include "jdwp/jdwp_event.h"
-#include "jdwp/jdwp_expand_buf.h"
-#include "logging.h"
-#include "stringprintf.h"
+#include "jdwp/jdwp_event.h"
+
+#include <stddef.h> /* for offsetof() */
#include <stdlib.h>
#include <string.h>
-#include <stddef.h> /* for offsetof() */
#include <unistd.h>
+#include "base/logging.h"
+#include "debugger.h"
+#include "jdwp/jdwp_constants.h"
+#include "jdwp/jdwp_expand_buf.h"
+#include "jdwp/jdwp_handler.h"
+#include "jdwp/jdwp_priv.h"
+#include "stringprintf.h"
+
/*
General notes:
diff --git a/src/jdwp/jdwp_event.h b/src/jdwp/jdwp_event.h
index b28aac9..a6eabb1 100644
--- a/src/jdwp/jdwp_event.h
+++ b/src/jdwp/jdwp_event.h
@@ -19,6 +19,7 @@
#ifndef ART_JDWP_JDWPEVENT_H_
#define ART_JDWP_JDWPEVENT_H_
+#include "jdwp/jdwp.h"
#include "jdwp/jdwp_constants.h"
#include "jdwp/jdwp_expand_buf.h"
diff --git a/src/jdwp/jdwp_expand_buf.cc b/src/jdwp/jdwp_expand_buf.cc
index 663afac..0a64f28 100644
--- a/src/jdwp/jdwp_expand_buf.cc
+++ b/src/jdwp/jdwp_expand_buf.cc
@@ -18,14 +18,15 @@
* primitive values, e.g. JDWP replies.
*/
-#include "jdwp/jdwp.h"
-#include "jdwp/jdwp_bits.h"
#include "jdwp/jdwp_expand_buf.h"
-#include "logging.h"
#include <stdlib.h>
#include <string.h>
+#include "base/logging.h"
+#include "jdwp/jdwp.h"
+#include "jdwp/jdwp_bits.h"
+
namespace art {
namespace JDWP {
diff --git a/src/jdwp/jdwp_expand_buf.h b/src/jdwp/jdwp_expand_buf.h
index ba70920..820f62d 100644
--- a/src/jdwp/jdwp_expand_buf.h
+++ b/src/jdwp/jdwp_expand_buf.h
@@ -19,6 +19,8 @@
#ifndef ART_JDWP_EXPANDBUF_H_
#define ART_JDWP_EXPANDBUF_H_
+#include <string>
+
#include <stddef.h>
#include <stdint.h>
diff --git a/src/jdwp/jdwp_handler.cc b/src/jdwp/jdwp_handler.cc
index 2a2bde2..c243ae2 100644
--- a/src/jdwp/jdwp_handler.cc
+++ b/src/jdwp/jdwp_handler.cc
@@ -25,21 +25,22 @@
* end of each function. Not needed at this time.
*/
-#include "atomic.h"
-#include "base/macros.h"
-#include "debugger.h"
-#include "jdwp/jdwp_priv.h"
#include "jdwp/jdwp_handler.h"
-#include "jdwp/jdwp_event.h"
-#include "jdwp/jdwp_constants.h"
-#include "jdwp/jdwp_expand_buf.h"
-#include "logging.h"
-#include "stringprintf.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include "atomic.h"
+#include "base/logging.h"
+#include "base/macros.h"
+#include "debugger.h"
+#include "jdwp/jdwp_constants.h"
+#include "jdwp/jdwp_event.h"
+#include "jdwp/jdwp_expand_buf.h"
+#include "jdwp/jdwp_priv.h"
+#include "stringprintf.h"
+
namespace art {
namespace JDWP {
diff --git a/src/jdwp/jdwp_main.cc b/src/jdwp/jdwp_main.cc
index 33aadee..f4250e5 100644
--- a/src/jdwp/jdwp_main.cc
+++ b/src/jdwp/jdwp_main.cc
@@ -14,21 +14,17 @@
* limitations under the License.
*/
-/*
- * JDWP initialization.
- */
-
-#include "atomic.h"
-#include "debugger.h"
-#include "jdwp/jdwp_priv.h"
-#include "logging.h"
-#include "scoped_thread_state_change.h"
-
+#include <errno.h>
#include <stdlib.h>
-#include <unistd.h>
#include <sys/time.h>
#include <time.h>
-#include <errno.h>
+#include <unistd.h>
+
+#include "atomic.h"
+#include "base/logging.h"
+#include "debugger.h"
+#include "jdwp/jdwp_priv.h"
+#include "scoped_thread_state_change.h"
namespace art {
diff --git a/src/jdwp/jdwp_socket.cc b/src/jdwp/jdwp_socket.cc
index 1cd610b..604ba83 100644
--- a/src/jdwp/jdwp_socket.cc
+++ b/src/jdwp/jdwp_socket.cc
@@ -13,25 +13,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
- * JDWP TCP socket network code.
- */
-#include "jdwp/jdwp_priv.h"
-#include "jdwp/jdwp_handler.h"
-#include "logging.h"
-#include "stringprintf.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
+#include <arpa/inet.h>
#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include <netdb.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "base/logging.h"
+#include "jdwp/jdwp_handler.h"
+#include "jdwp/jdwp_priv.h"
+#include "stringprintf.h"
#define kBasePort 8000
#define kMaxPort 8040