summaryrefslogtreecommitdiff
path: root/app/jni
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-07-31 12:09:49 +0200
committerParménides GV <parmegv@sdf.org>2014-07-31 12:09:49 +0200
commit0393ba6656ce6cf679a2c4663275b3ed0f1a34b9 (patch)
treef000311e97598ab3fc42e2bea23e6cb342ad166c /app/jni
parentb28eeb08e8ec3baafdd9388cc5b70c6c84db9cf1 (diff)
Updated ics-openvpn to rev 859 + no 2nd notification.
Diffstat (limited to 'app/jni')
-rw-r--r--app/jni/Android.mk6
-rw-r--r--app/jni/Application.mk2
2 files changed, 4 insertions, 4 deletions
diff --git a/app/jni/Android.mk b/app/jni/Android.mk
index a3280bd6..0c906f97 100644
--- a/app/jni/Android.mk
+++ b/app/jni/Android.mk
@@ -5,18 +5,18 @@ JNI_DIR := $(call my-dir)
#WITH_POLAR=1
#WITH_OPENVPN3=1
# Build openvpn with polar (OpenVPN3 core is always build with polar)
-USE_BREAKPAD=0
WITH_BREAKPAD=0
+
include lzo/Android.mk
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
+ include google-breakpad/android/google_breakpad/Android.mk
else
WITH_BREAKPAD=0
endif
diff --git a/app/jni/Application.mk b/app/jni/Application.mk
index 913e0a98..718e79a8 100644
--- a/app/jni/Application.mk
+++ b/app/jni/Application.mk
@@ -8,4 +8,4 @@ APP_STL:=stlport_shared
#LOCAL_ARM_MODE := arm
-#NDK_TOOLCHAIN_VERSION=clang
+#NDK_TOOLCHAIN_VERSION=clang \ No newline at end of file