From 62d486be7c8b6e866c3104b6e8170e69db0a95f1 Mon Sep 17 00:00:00 2001
From: "digit@chromium.org"
 <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>
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. <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
---
 configure | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index b2308814..1598db69 100755
--- a/configure
+++ b/configure
@@ -604,6 +604,8 @@ DISABLE_TOOLS_FALSE
 DISABLE_TOOLS_TRUE
 DISABLE_PROCESSOR_FALSE
 DISABLE_PROCESSOR_TRUE
+ANDROID_HOST_FALSE
+ANDROID_HOST_TRUE
 LINUX_HOST_FALSE
 LINUX_HOST_TRUE
 PTHREAD_CFLAGS
@@ -5239,9 +5241,9 @@ done
 
 # Only build Linux client libs when compiling for Linux
 case $host in
-     *-*-linux* | *-android* )
-        LINUX_HOST=true
-        ;;
+  *-*-linux* | *-android* )
+    LINUX_HOST=true
+    ;;
 esac
  if test x$LINUX_HOST = xtrue; then
   LINUX_HOST_TRUE=
@@ -5252,6 +5254,21 @@ else
 fi
 
 
+# Only use Android support headers when compiling for Android
+case $host in
+  *-android*)
+    ANDROID_HOST=true
+    ;;
+esac
+ if test x$ANDROID_HOST = xtrue; then
+  ANDROID_HOST_TRUE=
+  ANDROID_HOST_FALSE='#'
+else
+  ANDROID_HOST_TRUE='#'
+  ANDROID_HOST_FALSE=
+fi
+
+
 # Check whether --enable-m32 was given.
 if test "${enable_m32+set}" = set; then :
   enableval=$enable_m32; case "${enableval}" in
@@ -5481,6 +5498,10 @@ if test -z "${LINUX_HOST_TRUE}" && test -z "${LINUX_HOST_FALSE}"; then
   as_fn_error "conditional \"LINUX_HOST\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ANDROID_HOST_TRUE}" && test -z "${ANDROID_HOST_FALSE}"; then
+  as_fn_error "conditional \"ANDROID_HOST\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${DISABLE_PROCESSOR_TRUE}" && test -z "${DISABLE_PROCESSOR_FALSE}"; then
   as_fn_error "conditional \"DISABLE_PROCESSOR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
-- 
cgit v1.2.1