From f502e503fb9517a5027b623c30375c5b7f613744 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 13 Oct 2014 17:18:06 +0200 Subject: [PATCH] android: Remove references to libpts --- src/frontends/android/jni/Android.mk | 3 +-- src/frontends/android/jni/libandroidbridge/Android.mk | 3 +-- src/frontends/android/jni/libandroidbridge/byod/imc_android.c | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/frontends/android/jni/Android.mk b/src/frontends/android/jni/Android.mk index d09a4898a..2af0d2412 100644 --- a/src/frontends/android/jni/Android.mk +++ b/src/frontends/android/jni/Android.mk @@ -77,8 +77,7 @@ ifneq ($(strongswan_USE_BYOD),) strongswan_BUILD += \ strongswan/src/libtnccs \ strongswan/src/libtncif \ - strongswan/src/libimcv \ - strongswan/src/libpts + strongswan/src/libimcv endif include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ diff --git a/src/frontends/android/jni/libandroidbridge/Android.mk b/src/frontends/android/jni/libandroidbridge/Android.mk index 9c4561c3a..c56b8d5f0 100644 --- a/src/frontends/android/jni/libandroidbridge/Android.mk +++ b/src/frontends/android/jni/libandroidbridge/Android.mk @@ -34,7 +34,6 @@ LOCAL_C_INCLUDES += \ $(strongswan_PATH)/src/libimcv \ $(strongswan_PATH)/src/libtncif \ $(strongswan_PATH)/src/libtnccs \ - $(strongswan_PATH)/src/libpts \ $(strongswan_PATH)/src/libtls endif @@ -58,7 +57,7 @@ LOCAL_LDLIBS := -llog LOCAL_SHARED_LIBRARIES := libstrongswan libhydra libipsec libcharon ifneq ($(strongswan_USE_BYOD),) -LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs libpts +LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs endif include $(BUILD_SHARED_LIBRARY) diff --git a/src/frontends/android/jni/libandroidbridge/byod/imc_android.c b/src/frontends/android/jni/libandroidbridge/byod/imc_android.c index 1c6d59449..119d2a503 100644 --- a/src/frontends/android/jni/libandroidbridge/byod/imc_android.c +++ b/src/frontends/android/jni/libandroidbridge/byod/imc_android.c @@ -21,7 +21,6 @@ #include "../charonservice.h" #include -#include #include #include #include @@ -90,8 +89,6 @@ static TNC_Result tnc_imc_initialize(TNC_IMCID imc_id, return TNC_RESULT_FATAL; } - libpts_init(); - if (min_version > TNC_IFIMC_VERSION_1 || max_version < TNC_IFIMC_VERSION_1) { 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 = NULL; - libpts_deinit(); return TNC_RESULT_SUCCESS; }