diff options
author | Parménides GV <parmegv@sdf.org> | 2014-09-26 10:56:45 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-09-26 10:56:45 +0200 |
commit | d0f652308cf1d8d121c6e3656b0c2726e523bc1f (patch) | |
tree | cc84605593cd149aaaa16aaa711c64610970e072 /app/jni/Android.mk | |
parent | e5d9306d5d536d28b617f9dc2e42226e03462c70 (diff) | |
parent | 8c4b3edafc68e647bd44ae456c15f0aea9d45905 (diff) |
Merge branch 'develop' into release-0.7.0
Diffstat (limited to 'app/jni/Android.mk')
-rw-r--r-- | app/jni/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/jni/Android.mk b/app/jni/Android.mk index 33d0bc76..0c906f97 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,7 +13,7 @@ include snappy/Android.mk include openssl/Android.mk -ifneq ($(USE_BREAKPAD),0) +ifneq ($(WITH_BREAKPAD),0) ifneq ($(TARGET_ARCH),mips) WITH_BREAKPAD=1 include google-breakpad/android/google_breakpad/Android.mk |