commit 261ff50e32b2b2a41bd3993c37abb5a9a94e431b
author Christopher Ferris <cferris@google.com> Fri Jan 10 22:56:38 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 10 22:56:38 2014 +0000
tree 9a54a145b9561698132ab860ed9d5366f826aa6a
parent 99775d8751676e76e00ad72d7778ad9ba28cb454
parent 1da83c3eccac942939748b66eb24f85b5f1983d4

Merge "Init the abort_msg_address value."

debuggerd/debuggerd.c

diff --git a/debuggerd/debuggerd.c b/debuggerd/debuggerd.c
index 756f7bb..4fd0312 100644
--- a/debuggerd/debuggerd.c
+++ b/debuggerd/debuggerd.c
@@ -27,7 +27,7 @@
 
 #include <sys/ptrace.h>
 #include <sys/wait.h>
-#include <sys/exec_elf.h>
+#include <elf.h>
 #include <sys/stat.h>
 #include <sys/poll.h>
 

libcorkscrew/arch-arm/backtrace-arm.c

diff --git a/libcorkscrew/arch-arm/backtrace-arm.c b/libcorkscrew/arch-arm/backtrace-arm.c
index ff6c192..7bd0d8f 100644
--- a/libcorkscrew/arch-arm/backtrace-arm.c
+++ b/libcorkscrew/arch-arm/backtrace-arm.c
@@ -59,7 +59,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <sys/ptrace.h>
-#include <sys/exec_elf.h>
+#include <elf.h>
 #include <cutils/log.h>
 
 #if !defined(__BIONIC_HAVE_UCONTEXT_T)

libcorkscrew/arch-arm/ptrace-arm.c

diff --git a/libcorkscrew/arch-arm/ptrace-arm.c b/libcorkscrew/arch-arm/ptrace-arm.c
index 78a9ea9..a50844e 100644
--- a/libcorkscrew/arch-arm/ptrace-arm.c
+++ b/libcorkscrew/arch-arm/ptrace-arm.c
@@ -19,7 +19,7 @@
 
 #include "../ptrace-arch.h"
 
-#include <sys/exec_elf.h>
+#include <elf.h>
 #include <cutils/log.h>
 
 #ifndef PT_ARM_EXIDX