diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-08-25 15:37:27 +0200 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-08-25 15:37:27 +0200 |
| commit | c7307e752d8f47c68f834e22ee2ce0a14a70e695 (patch) | |
| tree | fbb442a20ab54aad511b46a070e65b8d09c22791 /src/libcharon/Android.mk | |
| parent | f74c6d77c3efb529e7403eeef0613c061eb895b3 (diff) | |
| parent | 6b99c8d9cff7b3e8ae8f3204b99e7ea40f791349 (diff) | |
| download | vyos-strongswan-c7307e752d8f47c68f834e22ee2ce0a14a70e695.tar.gz vyos-strongswan-c7307e752d8f47c68f834e22ee2ce0a14a70e695.zip | |
Merge tag 'upstream/5.1.0'
Upstream version 5.1.0
Diffstat (limited to 'src/libcharon/Android.mk')
| -rw-r--r-- | src/libcharon/Android.mk | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/src/libcharon/Android.mk b/src/libcharon/Android.mk index 66606f937..75cf74fa4 100644 --- a/src/libcharon/Android.mk +++ b/src/libcharon/Android.mk @@ -186,8 +186,11 @@ endif LOCAL_SRC_FILES += $(call add_plugin, eap-peap) -# adding libtls if any of the three plugins above is enabled -ifneq ($(or $(call plugin_enabled, eap-tls), $(call plugin_enabled, eap-ttls), $(call plugin_enabled, eap-peap)),) +LOCAL_SRC_FILES += $(call add_plugin, eap-tnc) + +# adding libtls if any of the four plugins above is enabled +ifneq ($(or $(call plugin_enabled, eap-tls), $(call plugin_enabled, eap-ttls), \ + $(call plugin_enabled, eap-peap), $(call plugin_enabled, eap-tnc)),) LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtls/ LOCAL_SRC_FILES += $(addprefix ../libtls/, \ tls_protection.c tls_compression.c tls_fragmentation.c tls_alert.c \ @@ -207,6 +210,32 @@ ifneq ($(call plugin_enabled, stroke),) LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stroke/ endif +LOCAL_SRC_FILES += $(call add_plugin, tnc-imc) +ifneq ($(call plugin_enabled, tnc-imc),) +LOCAL_SHARED_LIBRARIES += libdl +endif + +LOCAL_SRC_FILES += $(call add_plugin, tnc-tnccs) + +LOCAL_SRC_FILES += $(call add_plugin, tnccs-20) +LOCAL_SRC_FILES += $(call add_plugin_subdirs, tnccs-20, batch messages state_machine) +ifneq ($(call plugin_enabled, tnccs-20),) +LOCAL_C_INCLUDES += $(LOCAL_PATH)/plugins/tnccs_20/ +# for tls.h +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtls/ +endif + +ifneq ($(or $(call plugin_enabled, eap-tnc), $(call plugin_enabled, tnc-imc), \ + $(call plugin_enabled, tnc-tnccs), $(call plugin_enabled, tnccs-20)),) +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtnccs/ +LOCAL_SHARED_LIBRARIES += libtnccs +endif + +ifneq ($(or $(call plugin_enabled, tnc-imc), $(call plugin_enabled, tnc-tnccs), \ + $(call plugin_enabled, tnccs-20)),) +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtncif/ +LOCAL_SHARED_LIBRARIES += libtncif +endif # build libcharon -------------------------------------------------------------- |