summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-02-18 16:15:01 +0100
committerArne Schwabe <arne@rfc2549.org>2014-02-18 16:15:01 +0100
commitff572e939b1aaa5373bef8d2cd1ce31daaa13cf8 (patch)
tree38524b1f000aef8a1117d7d7be0d54039eee8466
parent1b9a8b81428a8d9fc20da93d0e01c8bf8f674a03 (diff)
make it easier to disable breakpad
--HG-- extra : rebase_source : c6832fdaac3421708edd4140762d12836f5053a2
-rw-r--r--main/jni/Android.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index fc2158d2..91dc7625 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -2,15 +2,20 @@
JNI_DIR := $(call my-dir)
#USE_POLAR=1
+USE_BREAKPAD=0
include lzo/Android.mk
include snappy/Android.mk
include openssl/Android.mk
-ifneq ($(TARGET_ARCH),mips)
-WITH_BREAKPAD=1
-include google-breakpad/android/google_breakpad/Android.mk
+ifeq ($(USE_BREAKPAD),1)
+ ifneq ($(TARGET_ARCH),mips)
+ WITH_BREAKPAD=1
+ include google-breakpad/android/google_breakpad/Android.mk
+ else
+ WITH_BREAKPAD=0
+ endif
else
WITH_BREAKPAD=0
endif