From 62d486be7c8b6e866c3104b6e8170e69db0a95f1 Mon Sep 17 00:00:00 2001 From: "digit@chromium.org" Date: Tue, 21 Aug 2012 14:34:48 +0000 Subject: 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. or ), 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 --- src/common/linux/elf_core_dump.h | 5 ----- src/common/linux/elfutils.h | 5 ----- 2 files changed, 10 deletions(-) (limited to 'src/common/linux') 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 -#if !defined(__ANDROID__) #include -#endif #include #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 -#include "client/linux/android_link.h" -#else #include #include -#endif #include namespace google_breakpad { -- cgit v1.2.1