From cac5d8c2235a6942fcf3c62ce7e775bbdfc620f0 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 10 Jan 2014 14:40:53 -0800
Subject: [PATCH] Use the more portable <elf.h> instead of <sys/exec_elf.h>.

Bug: 12476126
Change-Id: I08684987e867371d5537dadf1acb3408b420ad0c
---
 debuggerd/debuggerd.c                 | 2 +-
 libcorkscrew/arch-arm/backtrace-arm.c | 2 +-
 libcorkscrew/arch-arm/ptrace-arm.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debuggerd/debuggerd.c b/debuggerd/debuggerd.c
index 756f7bb10..4fd031201 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>
 
diff --git a/libcorkscrew/arch-arm/backtrace-arm.c b/libcorkscrew/arch-arm/backtrace-arm.c
index ff6c19211..7bd0d8f84 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)
diff --git a/libcorkscrew/arch-arm/ptrace-arm.c b/libcorkscrew/arch-arm/ptrace-arm.c
index 78a9ea9a4..a50844e69 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