aboutsummaryrefslogtreecommitdiff
path: root/android
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 /android
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 'android')
-rw-r--r--android/google_breakpad/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/google_breakpad/Android.mk b/android/google_breakpad/Android.mk
index f6d0b22a..784dc511 100644
--- a/android/google_breakpad/Android.mk
+++ b/android/google_breakpad/Android.mk
@@ -92,7 +92,9 @@ LOCAL_SRC_FILES := \
src/common/linux/memory_mapped_file.cc \
src/common/linux/safe_readlink.cc
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/src/common/android/include \
+ $(LOCAL_PATH)/src
+
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
LOCAL_EXPORT_LDLIBS := -llog