Merge "Test for _WIN32 in instead of USE_MINGW."
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp
index 77c138f..a6d3d38 100644
--- a/debuggerd/debuggerd.cpp
+++ b/debuggerd/debuggerd.cpp
@@ -19,6 +19,7 @@
#include <elf.h>
#include <errno.h>
#include <fcntl.h>
+#include <linux/input.h>
#include <pthread.h>
#include <signal.h>
#include <stdarg.h>
@@ -39,16 +40,13 @@
#include <selinux/android.h>
-#include <log/logger.h>
-
+#include <android/log.h>
#include <android-base/file.h>
#include <android-base/unique_fd.h>
#include <cutils/debugger.h>
#include <cutils/properties.h>
#include <cutils/sockets.h>
-#include <linux/input.h>
-
#include <private/android_filesystem_config.h>
#include <debuggerd/client.h>
diff --git a/debuggerd/signal_sender.cpp b/debuggerd/signal_sender.cpp
index 4be7e6e..3adbef2 100644
--- a/debuggerd/signal_sender.cpp
+++ b/debuggerd/signal_sender.cpp
@@ -24,7 +24,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include <log/logger.h>
+#include <android/log.h>
#include "signal_sender.h"
diff --git a/debuggerd/test/log_fake.cpp b/debuggerd/test/log_fake.cpp
index ebf966f..59910ad 100644
--- a/debuggerd/test/log_fake.cpp
+++ b/debuggerd/test/log_fake.cpp
@@ -21,7 +21,6 @@
#include <android/log.h>
#include <android-base/stringprintf.h>
-#include <log/logger.h>
// Forward declarations.
class Backtrace;
diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index 5c7f024..c87182e 100644
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -37,7 +37,6 @@
#include <backtrace/Backtrace.h>
#include <backtrace/BacktraceMap.h>
#include <cutils/properties.h>
-#include <log/logger.h>
#include <log/logprint.h>
#include <private/android_filesystem_config.h>
diff --git a/include/log/logprint.h b/include/log/logprint.h
index f70633d..e5cd1de 100644
--- a/include/log/logprint.h
+++ b/include/log/logprint.h
@@ -21,7 +21,7 @@
#include <android/log.h>
#include <log/event_tag_map.h>
-#include <log/logger.h>
+#include <log/logger.h> /* struct logger_entry */
#ifdef __cplusplus
extern "C" {
diff --git a/include/private/android_logger.h b/include/private/android_logger.h
index b6a20c3..d477ac1 100644
--- a/include/private/android_logger.h
+++ b/include/private/android_logger.h
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include <android/log.h>
-#include <log/logger.h>
+#include <log/logger.h> /* log_time */
#define LOGGER_MAGIC 'l'
diff --git a/init/devices.cpp b/init/devices.cpp
index bad04ae..1a6912f 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -294,7 +294,7 @@
name += 9;
}
- LOG(INFO) << "adding platform device " << name << " (" << path << ")";
+ LOG(VERBOSE) << "adding platform device " << name << " (" << path << ")";
bus = (platform_node*) calloc(1, sizeof(struct platform_node));
bus->path = strdup(path);
diff --git a/init/service.cpp b/init/service.cpp
index 1caf7c6..503d84f 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -561,7 +561,7 @@
}
}
- LOG(VERBOSE) << "starting service '" << name_ << "'...";
+ LOG(INFO) << "starting service '" << name_ << "'...";
pid_t pid = -1;
if (namespace_flags_) {
@@ -939,13 +939,13 @@
}
if (WIFEXITED(status)) {
- LOG(VERBOSE) << name << " exited with status " << WEXITSTATUS(status);
+ LOG(INFO) << name << " exited with status " << WEXITSTATUS(status);
} else if (WIFSIGNALED(status)) {
- LOG(VERBOSE) << name << " killed by signal " << WTERMSIG(status);
+ LOG(INFO) << name << " killed by signal " << WTERMSIG(status);
} else if (WIFSTOPPED(status)) {
- LOG(VERBOSE) << name << " stopped by signal " << WSTOPSIG(status);
+ LOG(INFO) << name << " stopped by signal " << WSTOPSIG(status);
} else {
- LOG(VERBOSE) << name << " state changed";
+ LOG(INFO) << name << " state changed";
}
if (!svc) {
diff --git a/liblog/logprint.c b/liblog/logprint.c
index 2c4e619..f9b14bd 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -33,6 +33,7 @@
#include <android/log.h>
#include <cutils/list.h>
+#include <log/logger.h>
#include <log/logprint.h>
#include "log_portability.h"