From 1a13af33256b570025004a6fee0853df75ee1212 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 11 May 2017 16:18:32 +0200 Subject: Version 0.6.66 CVE-2017-7478 and CVE-2017-7479 --- main/jni/Android.mk | 4 ++-- main/jni/Application.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'main/jni') 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 -- cgit v1.2.3