Added support for the curl plugin on Android

diff --git a/Android.mk.in b/Android.mk.in
index 2563b7a3dc02e5db69421b9b4742495b3c7399b1..fe012ace884a2ab3b0fbc2d89d93da9ea15742e9 100644 (file)
--- a/Android.mk.in
+++ b/Android.mk.in
@@ -39,6 +39,7 @@ add_plugin = $(if $(call plugin_enabled,$(1)), \
 # includes
 strongswan_PATH := $(LOCAL_PATH)
 libvstr_PATH := external/strongswan-support/vstr/include
+libcurl_PATH := external/strongswan-support/libcurl/include
 libgmp_PATH := external/strongswan-support/gmp
 
 # some definitions

diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 77b0fa99e0b8fc32536c9bc9bddd4e5aed3a7995..a41a1a26d485028a56cf99f57d6e37b800b3ef45 100644 (file)
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -80,6 +80,12 @@ utils/backtrace.c utils/backtrace.h
 
 LOCAL_SRC_FILES += $(call add_plugin, aes)
 
+LOCAL_SRC_FILES += $(call add_plugin, curl)
+ifneq ($(call plugin_enabled, curl),)
+LOCAL_C_INCLUDES += $(libcurl_PATH)
+LOCAL_SHARED_LIBRARIES += libcurl
+endif
+
 LOCAL_SRC_FILES += $(call add_plugin, des)
 
 LOCAL_SRC_FILES += $(call add_plugin, fips-prf)