From ccfc4d3a763d27a99c0fe0bf4be59ec74521a36a Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Mon, 26 Sep 2016 18:15:53 +0200 Subject: Update OpenVPN 3 code for released code --- main/ovpn3/Android.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'main/ovpn3/Android.mk') diff --git a/main/ovpn3/Android.mk b/main/ovpn3/Android.mk index 7f037ac0..4564ca52 100644 --- a/main/ovpn3/Android.mk +++ b/main/ovpn3/Android.mk @@ -3,16 +3,18 @@ LOCAL_PATH:= $(call my-dir)/ include $(CLEAR_VARS) LOCAL_LDLIBS := -lz -LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn3/client openvpn3 boost_1_55_0 polarssl/include snappy +LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn3/client openvpn3 boost_1_55_0 polarssl/include snappy asio/asio/include LOCAL_CPP_FEATURES += exceptions rtti #LOCAL_SHARED_LIBRARIES := libssl libcrypto -LOCAL_SHARED_LIBRARIES := polarssl-dynamic -#LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static liblzo-static -LOCAL_STATIC_LIBRARIES := liblzo-static snappy-static +#LOCAL_SHARED_LIBRARIES := polarssl-dynamic +LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static liblzo-static +#LOCAL_STATIC_LIBRARIES := liblzo-static -#LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" -DUSE_OPENSSL -DOPENSSL_NO_ENGINE -LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" -DUSE_POLARSSL -DHAVE_SNAPPY -DHAVE_LZO +#LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" -DUSE_POLARSSL -DHAVE_LZO -DASIO_STANDALONE +LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" -DUSE_OPENSSL -DHAVE_LZO -DASIO_STANDALONE + +LOCAL_CXXFLAGS += -std=c++1y #ifneq ($(TARGET_ARCH),mips) #LOCAL_STATIC_LIBRARIES += breakpad_client @@ -23,7 +25,6 @@ LOCAL_MODULE = ovpn3 LOCAL_SRC_FILES:= \ ../openvpn3/javacli/ovpncli_wrap.cxx \ - boostsrc/error_code.cpp \ ../openvpn3/client/ovpncli.cpp \ -- cgit v1.2.3