diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-11-25 13:19:21 +0100 |
| commit | 576b0c26baf9b5b1418650a572604325ca7fb3af (patch) | |
| tree | 8b2986d66ed4e6bdf5a3253c81f32cc5a8e53b99 /app/jni/Android.mk | |
| parent | bbf877a099112acbf34589b01503c3f5ee135dc0 (diff) | |
| parent | 48cd0f2fa3094b5a6b7b07d6413d77bdbc9bbc20 (diff) | |
Merge branch 'develop'0.8.0
Diffstat (limited to 'app/jni/Android.mk')
| -rw-r--r-- | app/jni/Android.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/app/jni/Android.mk b/app/jni/Android.mk index 0c906f97..90074b0f 100644 --- a/app/jni/Android.mk +++ b/app/jni/Android.mk @@ -5,7 +5,7 @@ JNI_DIR := $(call my-dir) #WITH_POLAR=1 #WITH_OPENVPN3=1 # Build openvpn with polar (OpenVPN3 core is always build with polar) -WITH_BREAKPAD=0 +#WITH_BREAKPAD=0 include lzo/Android.mk @@ -13,15 +13,18 @@ include snappy/Android.mk include openssl/Android.mk -ifneq ($(WITH_BREAKPAD),0) - ifneq ($(TARGET_ARCH),mips) +ifeq ($(TARGET_ARCH),mips) + USE_BREAKPAD=0 +endif +ifeq ($(TARGET_ARCH),mips64) + USE_BREAKPAD=0 +endif + +ifneq ($(USE_BREAKPAD),0) WITH_BREAKPAD=1 include google-breakpad/android/google_breakpad/Android.mk - else - WITH_BREAKPAD=0 - endif else -WITH_BREAKPAD=0 + WITH_BREAKPAD=0 endif ifeq ($(WITH_POLAR),1) |