aboutsummaryrefslogtreecommitdiff
path: root/src/common/linux
diff options
context:
space:
mode:
authordigit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-08-21 14:34:48 +0000
committerdigit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2012-08-21 14:34:48 +0000
commit62d486be7c8b6e866c3104b6e8170e69db0a95f1 (patch)
tree4ed041798986544b35a38edb49af042e49e0b8f9 /src/common/linux
parentFix Android build. (diff)
downloadbreakpad-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/common/linux')
-rw-r--r--src/common/linux/elf_core_dump.h5
-rw-r--r--src/common/linux/elfutils.h5
2 files changed, 0 insertions, 10 deletions
diff --git a/src/common/linux/elf_core_dump.h b/src/common/linux/elf_core_dump.h
index dd846f09..d03c7a88 100644
--- a/src/common/linux/elf_core_dump.h
+++ b/src/common/linux/elf_core_dump.h
@@ -34,15 +34,10 @@
#define COMMON_LINUX_ELF_CORE_DUMP_H_
#include <elf.h>
-#if !defined(__ANDROID__)
#include <link.h>
-#endif
#include <stddef.h>
#include "common/memory_range.h"
-#if defined(__ANDROID__)
-#include "common/linux/android_link.h"
-#endif
namespace google_breakpad {
diff --git a/src/common/linux/elfutils.h b/src/common/linux/elfutils.h
index 95105966..748da988 100644
--- a/src/common/linux/elfutils.h
+++ b/src/common/linux/elfutils.h
@@ -33,13 +33,8 @@
#ifndef COMMON_LINUX_ELFUTILS_H__
#define COMMON_LINUX_ELFUTILS_H__
-#if defined(__ANDROID__)
-#include <linux/elf.h>
-#include "client/linux/android_link.h"
-#else
#include <elf.h>
#include <link.h>
-#endif
#include <stdint.h>
namespace google_breakpad {