diff options
| author | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-04-03 16:38:53 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-04-03 16:38:53 +0000 |
| commit | 4f291f0307ae6f33f70f578cbcd4450923692412 (patch) | |
| tree | bd671ae6f9fcf46d1764c2deae9d691325bbbe62 /src/client/linux/android_link.h | |
| parent | Remove redundant include of CPP specific header files (diff) | |
| download | breakpad-4f291f0307ae6f33f70f578cbcd4450923692412.tar.xz | |
Changes to get the breakpad client compiling and running on Android using
ndk-7b.
Patch by Carlos Valdivia <carlosvaldivia@google.com>
Review URL: https://breakpad.appspot.com/363001/
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@945 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/linux/android_link.h')
| -rw-r--r-- | src/client/linux/android_link.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/client/linux/android_link.h b/src/client/linux/android_link.h index 430ac3b6..32261fc2 100644 --- a/src/client/linux/android_link.h +++ b/src/client/linux/android_link.h @@ -33,7 +33,11 @@ #ifndef GOOGLE_BREAKPAD_CLIENT_LINUX_ANDROID_LINK_H_ #define GOOGLE_BREAKPAD_CLIENT_LINUX_ANDROID_LINK_H_ -#include <sys/exec_elf.h> +// TODO(zhenghao): exec_elf.h conflicts with linux/elf.h. +// But we still need ELFSIZE. +//#include <sys/exec_elf.h> +#include <machine/exec.h> +#define ELFSIZE ARCH_ELFSIZE #ifndef ElfW #define ElfW(type) _ElfW (Elf, ELFSIZE, type) |