am f6721978: Merge "Fix x86 build to use <elf.h>."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'f67219783fa7c38c1f4f077364290d10d3aa1db4':
  Fix x86 build to use <elf.h>.
This commit is contained in:
Elliott Hughes 2013-01-29 16:58:45 -08:00 committed by Android Git Automerger
commit 1cc09402e8

View File

@ -26,8 +26,8 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include <elf.h>
#include <sys/types.h> #include <sys/types.h>
#include <linux/elf.h>
#include <link.h> #include <link.h>
/* Dynamic binaries get this from the dynamic linker (system/linker), which /* Dynamic binaries get this from the dynamic linker (system/linker), which