summaryrefslogtreecommitdiff
path: root/main/openvpn/Android.mk
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-04-23 09:56:37 +0200
committerArne Schwabe <arne@rfc2549.org>2014-04-23 09:56:37 +0200
commite436c963f0976b885a7db04681344779e26dd3b5 (patch)
tree240663106f32e02e1c34080656f4ef21a2e1776e /main/openvpn/Android.mk
parent6a99715a9b072fa249e79c98cd9f03991f0f1219 (diff)
Update OpenSSL to 1.0.1g and statically link OpenVPN with it
Diffstat (limited to 'main/openvpn/Android.mk')
-rw-r--r--main/openvpn/Android.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/main/openvpn/Android.mk b/main/openvpn/Android.mk
index f3224201..6dfe6777 100644
--- a/main/openvpn/Android.mk
+++ b/main/openvpn/Android.mk
@@ -6,7 +6,7 @@ LOCAL_LDLIBS := -lz
LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn/src/openvpn openvpn/include google-breakpad/src google-breakpad/src/common/android/include polarssl/include snappy
-#LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static liblzo-static
+
LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\"
LOCAL_STATIC_LIBRARIES := liblzo-static snappy-static
@@ -15,7 +15,8 @@ ifeq ($(WITH_POLAR),1)
LOCAL_STATIC_LIBRARIES += polarssl-static
LOCAL_CFLAGS += -DENABLE_CRYPTO_POLARSSL=1
else
-LOCAL_SHARED_LIBRARIES := libssl libcrypto
+#LOCAL_SHARED_LIBRARIES := libssl libcrypto
+LOCAL_STATIC_LIBRARIES += libssl_static libcrypto_static
LOCAL_CFLAGS += -DENABLE_CRYPTO_OPENSSL=1
endif