denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Several plugins were moved from libcharon to libtnccs

Browse Source 
These were moved in commits e8f65c5cde and 12b3db5006.
This commit is contained in:
Tobias Brunner
2013-09-23 11:49:52 +02:00
parent c3ee829eee
commit e3f64a79c2
2 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/Android.mk
+5 -29
View File
@@ -187,6 +187,10 @@ endif
LOCAL_SRC_FILES += $(call add_plugin, eap-peap) LOCAL_SRC_FILES += $(call add_plugin, eap-peap)
LOCAL_SRC_FILES += $(call add_plugin, eap-tnc) LOCAL_SRC_FILES += $(call add_plugin, eap-tnc)
ifneq ($(call plugin_enabled, eap-tnc),)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../libtnccs/ $(LOCAL_PATH)/../libtncif/
LOCAL_SHARED_LIBRARIES += libtnccs libtncif
endif
# adding libtls if any of the four plugins above is enabled # adding libtls if any of the four plugins above is enabled
ifneq ($(or $(call plugin_enabled, eap-tls), $(call plugin_enabled, eap-ttls), \ ifneq ($(or $(call plugin_enabled, eap-tls), $(call plugin_enabled, eap-ttls), \
@@ -210,41 +214,13 @@ ifneq ($(call plugin_enabled, stroke),)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stroke/ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stroke/
endif 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 -------------------------------------------------------------- # build libcharon --------------------------------------------------------------
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(libvstr_PATH) \ $(libvstr_PATH) \
$(strongswan_PATH)/src/include \ $(strongswan_PATH)/src/include \
$(strongswan_PATH)/src/libhydra \ $(strongswan_PATH)/src/libhydra \
$(strongswan_PATH)/src/libstrongswan \ $(strongswan_PATH)/src/libstrongswan
$(strongswan_PATH)/src/libtncif
LOCAL_CFLAGS := $(strongswan_CFLAGS) LOCAL_CFLAGS := $(strongswan_CFLAGS)
src/libtnccs/Android.mk
+20
View File
@@ -12,6 +12,26 @@ tnc/tnccs/tnccs_manager.h tnc/tnccs/tnccs_manager.c
LOCAL_SRC_FILES := $(filter %.c,$(libtnccs_la_SOURCES)) LOCAL_SRC_FILES := $(filter %.c,$(libtnccs_la_SOURCES))
# adding the plugin source files
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 messages/ietf messages/tcg state_machine)
ifneq ($(call plugin_enabled, tnccs-20),)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/plugins/tnccs_20/
endif
ifneq ($(or $(call plugin_enabled, tnc-imc), $(call plugin_enabled, tnc-tnccs), \
$(call plugin_enabled, tnccs-20)),)
LOCAL_SHARED_LIBRARIES += libtncif
endif
# build libtncif --------------------------------------------------------------- # build libtncif ---------------------------------------------------------------
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \