diff options
| author | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-08-21 14:34:48 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-08-21 14:34:48 +0000 |
| commit | 62d486be7c8b6e866c3104b6e8170e69db0a95f1 (patch) | |
| tree | 4ed041798986544b35a38edb49af042e49e0b8f9 /src/client/linux/handler | |
| parent | Fix Android build. (diff) | |
| download | breakpad-62d486be7c8b6e866c3104b6e8170e69db0a95f1.tar.xz | |
Improve Android support
This patch remove many Android-specific #ifdefs from the Breakpad
source code. This is achieved by providing "fixed-up" platform
headers (e.g. <signal.h> or <sys/user,h>), in the new directory
src/common/android/include/, which masks differences between
the NDK and GLibc headers.
The old "android_link.h" and "android_ucontext.h" are moved
and renamed.
This also requires putting this directory as the first
include path during Android-hosted builds, hence the
modification of Makefile.am and configure.ac
Review URL: https://breakpad.appspot.com/434002
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1017 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/linux/handler')
| -rw-r--r-- | src/client/linux/handler/exception_handler.cc | 2 | ||||
| -rw-r--r-- | src/client/linux/handler/exception_handler.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc index f10cdbf1..0cdde2d1 100644 --- a/src/client/linux/handler/exception_handler.cc +++ b/src/client/linux/handler/exception_handler.cc @@ -77,12 +77,10 @@ #include <sys/wait.h> #include <unistd.h> -#if !defined(__ANDROID__) #include <sys/signal.h> #include <sys/ucontext.h> #include <sys/user.h> #include <ucontext.h> -#endif #include <algorithm> #include <utility> diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h index f66b8270..f9e7ce3b 100644 --- a/src/client/linux/handler/exception_handler.h +++ b/src/client/linux/handler/exception_handler.h @@ -37,10 +37,8 @@ #include <signal.h> #include <stdint.h> #include <stdio.h> +#include <sys/ucontext.h> -#if defined(__ANDROID__) -#include "client/linux/android_ucontext.h" -#endif #include "client/linux/crash_generation/crash_generation_client.h" #include "client/linux/handler/minidump_descriptor.h" #include "client/linux/minidump_writer/minidump_writer.h" |