summaryrefslogtreecommitdiff
path: root/main/jni/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'main/jni/Android.mk')
-rw-r--r--main/jni/Android.mk23
1 files changed, 14 insertions, 9 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index fed2bdea..361f2184 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -5,26 +5,31 @@ JNI_DIR := $(call my-dir)
#WITH_MBEDTLS=1
#WITH_OPENVPN3=1
# Build openvpn with mbedTLS (OpenVPN3 core is always build with mbedTLS)
-#WITH_BREAKPAD=0
+#USE_BREAKPAD=0
include lzo/Android.mk
include openssl/Android.mk
ifeq ($(TARGET_ARCH),mips)
- USE_BREAKPAD=0
-endif
-ifeq ($(TARGET_ARCH),mips64)
- USE_BREAKPAD=0
-endif
-
-ifeq ($(USE_BREAKPAD),1)
+ WITH_BREAKPAD=0
+else ifeq ($(TARGET_ARCH),mips64)
+ WITH_BREAKPAD=0
+else ifeq ($(USE_BREAKPAD),1)
WITH_BREAKPAD=1
- include breakpad/android/google_breakpad/Android.mk
else
WITH_BREAKPAD=0
endif
+#ifeq ($(TARGET_ARCH),x86)
+# USE_BREAKPAD=0
+#endif
+
+
+ifeq ($(WITH_BREAKPAD),1)
+ include breakpad/android/google_breakpad/Android.mk
+endif
+
ifeq ($(WITH_MBEDTLS),1)
USE_MBEDTLS=1
endif