summaryrefslogtreecommitdiffstats
path: root/debuggerd
diff options
context:
space:
mode:
Diffstat (limited to 'debuggerd')
-rw-r--r--debuggerd/debuggerd.c9
-rw-r--r--debuggerd/tombstone.c2
-rw-r--r--debuggerd/utility.c2
3 files changed, 8 insertions, 5 deletions
diff --git a/debuggerd/debuggerd.c b/debuggerd/debuggerd.c
index da2e9b0..756f7bb 100644
--- a/debuggerd/debuggerd.c
+++ b/debuggerd/debuggerd.c
@@ -31,9 +31,10 @@
#include <sys/stat.h>
#include <sys/poll.h>
+#include <log/logd.h>
+#include <log/logger.h>
+
#include <cutils/sockets.h>
-#include <cutils/logd.h>
-#include <cutils/logger.h>
#include <cutils/properties.h>
#include <cutils/debugger.h>
@@ -435,11 +436,13 @@ static int do_server() {
signal(SIGBUS, SIG_DFL);
signal(SIGFPE, SIG_DFL);
signal(SIGSEGV, SIG_DFL);
- signal(SIGPIPE, SIG_DFL);
#ifdef SIGSTKFLT
signal(SIGSTKFLT, SIG_DFL);
#endif
+ // Ignore failed writes to closed sockets
+ signal(SIGPIPE, SIG_IGN);
+
logsocket = socket_local_client("logd",
ANDROID_SOCKET_NAMESPACE_ABSTRACT, SOCK_DGRAM);
if(logsocket < 0) {
diff --git a/debuggerd/tombstone.c b/debuggerd/tombstone.c
index 48d7aa9..aa63547 100644
--- a/debuggerd/tombstone.c
+++ b/debuggerd/tombstone.c
@@ -29,7 +29,7 @@
#include <private/android_filesystem_config.h>
-#include <cutils/logger.h>
+#include <log/logger.h>
#include <cutils/properties.h>
#include <backtrace/backtrace.h>
diff --git a/debuggerd/utility.c b/debuggerd/utility.c
index 9bf3c18..41be982 100644
--- a/debuggerd/utility.c
+++ b/debuggerd/utility.c
@@ -22,7 +22,7 @@
#include <errno.h>
#include <unistd.h>
#include <signal.h>
-#include <cutils/logd.h>
+#include <log/logd.h>
#include <sys/ptrace.h>
#include <sys/wait.h>
#include <arpa/inet.h>