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

# Via Android Git Automerger (1) and others
* commit '1cc09402e86b91213e06a9a349c5c510cefcf1d5':
  Fix x86 build to use <elf.h>.
This commit is contained in:
Elliott Hughes
2013-01-29 17:04:14 -08:00
committed by Android Git Automerger

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