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

android: Remove references to libpts

Browse Source
This commit is contained in:
Tobias Brunner
2014-10-13 17:18:06 +02:00
parent ffa800ce9d
commit f502e503fb
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/jni/Android.mk
+1 -2
View File
@@ -77,8 +77,7 @@ ifneq ($(strongswan_USE_BYOD),)
strongswan_BUILD += \ strongswan_BUILD += \
strongswan/src/libtnccs \ strongswan/src/libtnccs \
strongswan/src/libtncif \ strongswan/src/libtncif \
strongswan/src/libimcv \ strongswan/src/libimcv
strongswan/src/libpts
endif endif
include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
src/frontends/android/jni/libandroidbridge/Android.mk
+1 -2
View File
@@ -34,7 +34,6 @@ LOCAL_C_INCLUDES += \
$(strongswan_PATH)/src/libimcv \ $(strongswan_PATH)/src/libimcv \
$(strongswan_PATH)/src/libtncif \ $(strongswan_PATH)/src/libtncif \
$(strongswan_PATH)/src/libtnccs \ $(strongswan_PATH)/src/libtnccs \
$(strongswan_PATH)/src/libpts \
$(strongswan_PATH)/src/libtls $(strongswan_PATH)/src/libtls
endif endif
@@ -58,7 +57,7 @@ LOCAL_LDLIBS := -llog
LOCAL_SHARED_LIBRARIES := libstrongswan libhydra libipsec libcharon LOCAL_SHARED_LIBRARIES := libstrongswan libhydra libipsec libcharon
ifneq ($(strongswan_USE_BYOD),) ifneq ($(strongswan_USE_BYOD),)
LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs libpts LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs
endif endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
src/frontends/android/jni/libandroidbridge/byod/imc_android.c
-4
View File
@@ -21,7 +21,6 @@
#include "../charonservice.h" #include "../charonservice.h"
#include <tnc/tnc.h> #include <tnc/tnc.h>
#include <libpts.h>
#include <imcv.h> #include <imcv.h>
#include <imc/imc_agent.h> #include <imc/imc_agent.h>
#include <imc/imc_msg.h> #include <imc/imc_msg.h>
@@ -90,8 +89,6 @@ static TNC_Result tnc_imc_initialize(TNC_IMCID imc_id,
return TNC_RESULT_FATAL; return TNC_RESULT_FATAL;
} }
libpts_init();
if (min_version > TNC_IFIMC_VERSION_1 || max_version < TNC_IFIMC_VERSION_1) if (min_version > TNC_IFIMC_VERSION_1 || max_version < TNC_IFIMC_VERSION_1)
{ {
DBG1(DBG_IMC, "no common IF-IMC version"); DBG1(DBG_IMC, "no common IF-IMC version");
@@ -643,7 +640,6 @@ static TNC_Result tnc_imc_terminate(TNC_IMCID imc_id)
} }
imc_android->destroy(imc_android); imc_android->destroy(imc_android);
imc_android = NULL; imc_android = NULL;
libpts_deinit();
return TNC_RESULT_SUCCESS; return TNC_RESULT_SUCCESS;
} }