summaryrefslogtreecommitdiff
path: root/main/jni
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2017-05-11 16:18:32 +0200
committerArne Schwabe <arne@rfc2549.org>2017-05-11 16:18:32 +0200
commit1a13af33256b570025004a6fee0853df75ee1212 (patch)
tree42d7d112b5ee0b216b08e902b44232d972223110 /main/jni
parentd3812892c894887ee8191ae84cc3a9f3d2e3fe88 (diff)
Version 0.6.66 CVE-2017-7478 and CVE-2017-7479v0.6.66-productionv0.6.66
Diffstat (limited to 'main/jni')
-rw-r--r--main/jni/Android.mk4
-rw-r--r--main/jni/Application.mk6
2 files changed, 5 insertions, 5 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk
index 0b8a2ee4..75c05bdc 100644
--- a/main/jni/Android.mk
+++ b/main/jni/Android.mk
@@ -52,14 +52,14 @@ LOCAL_PATH := $(JNI_DIR)
# The only real JNI libraries
include $(CLEAR_VARS)
LOCAL_LDLIBS := -llog -lz
-LOCAL_CFLAGS = --std=c99 -DTARGET_ARCH_ABI=\"${TARGET_ARCH_ABI}\"
+LOCAL_CFLAGS = -DTARGET_ARCH_ABI=\"${TARGET_ARCH_ABI}\"
LOCAL_SRC_FILES:= jniglue.c scan_ifs.c
LOCAL_MODULE = opvpnutil
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_LDLIBS := -llog -lz
-LOCAL_CFLAGS = --std=c99
+LOCAL_CFLAGS =
LOCAL_C_INCLUDES := openssl/include openssl/crypto openssl
LOCAL_SRC_FILES:= jbcrypto.cpp
LOCAL_MODULE = jbcrypto
diff --git a/main/jni/Application.mk b/main/jni/Application.mk
index 9495a77a..c38403a4 100644
--- a/main/jni/Application.mk
+++ b/main/jni/Application.mk
@@ -1,8 +1,8 @@
-APP_ABI := arm64-v8a armeabi armeabi-v7a mips x86 x86_64
+APP_ABI := arm64-v8a armeabi armeabi-v7a x86 x86_64
APP_PLATFORM := android-14
-APP_STL:=stlport_static
-#APP_STL:=gnustl_shared
+#APP_STL:=stlport_static
+APP_STL:=c++_static
#APP_OPTIM := release