commit 1972955eca052b07b454c4d26012f986c02bb06f
author Elliott Hughes <enh@google.com> Fri Jan 10 14:59:20 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 10 14:59:20 2014 -0800
tree 098b8db56dbdaecd22c951c27ba4708c5178ebfb
parent 709543a96836be5f1c10e4051ec6207dec72cd08
parent 99775d8751676e76e00ad72d7778ad9ba28cb454

am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."

* commit '99775d8751676e76e00ad72d7778ad9ba28cb454':
  Use the more portable <elf.h> instead of <sys/exec_elf.h>.

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