summaryrefslogtreecommitdiff
path: root/app/jni/Android.mk
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-10-02 18:19:30 +0200
committerParménides GV <parmegv@sdf.org>2014-10-02 18:19:30 +0200
commit34643c6b5ab0643383e24025876b0d69859ba4f9 (patch)
treecb15666fb01b0f0410327ae7aaa23df444ac3b4c /app/jni/Android.mk
parent22b7ee4614a2f47d55496de8a9b55040c0f4ba85 (diff)
parent914c5156b014970dde717b9a27c0c69f11cc7d98 (diff)
Merge branch 'feature/Update-ndk-version-and-native-binaries-#6142' into develop
Diffstat (limited to 'app/jni/Android.mk')
-rw-r--r--app/jni/Android.mk17
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)