commit 807444fe87b61e9e306cab09bb51ea7fa02ce1fc
author Elliott Hughes <enh@google.com> Fri Feb 03 19:59:42 2012 -0800
committer Elliott Hughes <enh@google.com> Fri Feb 03 19:59:42 2012 -0800
tree 5779950ea87e1aac3ffdae9d0b279f1e8c38af38
parent 7646444a859bc9ac03431915dfdc82dad1790f4d

Switch to more traditional logging on Android.

The Linux logging stays google3-like.

Change-Id: I936f0529993cfcfb34c51382e699ec9759151d26

src/jdwp/jdwp_priv.h

diff --git a/src/jdwp/jdwp_priv.h b/src/jdwp/jdwp_priv.h
index d2c35dd..f1e97b7 100644
--- a/src/jdwp/jdwp_priv.h
+++ b/src/jdwp/jdwp_priv.h
@@ -19,8 +19,6 @@
 #ifndef ART_JDWP_JDWPPRIV_H_
 #define ART_JDWP_JDWPPRIV_H_
 
-#define LOG_TAG "jdwp"
-
 #include "debugger.h"
 #include "jdwp/jdwp.h"
 #include "jdwp/jdwp_event.h"

src/logging_android.cc

diff --git a/src/logging_android.cc b/src/logging_android.cc
index fa574d4..edfa42f 100644
--- a/src/logging_android.cc
+++ b/src/logging_android.cc
@@ -15,6 +15,7 @@
  */
 
 #include "logging.h"
+#include "stringprintf.h"
 
 #include <iostream>
 #include <unistd.h>
@@ -30,13 +31,11 @@
 
 LogMessage::LogMessage(const char* file, int line, LogSeverity severity, int error)
     : data_(new LogMessageData(line, severity, error)) {
-  const char* last_slash = strrchr(file, '/');
-  data_->file = (last_slash == NULL) ? file : last_slash + 1;
 }
 
 void LogMessage::LogLine(const char* line) {
   int priority = kLogSeverityToAndroidLogPriority[data_->severity];
-  LOG_PRI(priority, LOG_TAG, "%s:%d] %s", data_->file, data_->line_number, line);
+  LOG_PRI(priority, "art", "%s", line);
 }
 
 }  // namespace art