From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 13 Oct 2014 15:18:06 +0000 (+0200)
Subject: android: Remove references to libpts
X-Git-Tag: 5.2.1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f502e503fb9517a5027b623c30375c5b7f613744;p=thirdparty%2Fstrongswan.git

android: Remove references to libpts
---

diff --git a/src/frontends/android/jni/Android.mk b/src/frontends/android/jni/Android.mk
index d09a4898a1..2af0d24124 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 9c4561c3a4..c56b8d5f02 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 1c6d594495..119d2a5039 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 <tnc/tnc.h>
-#include <libpts.h>
 #include <imcv.h>
 #include <imc/imc_agent.h>
 #include <imc/imc_msg.h>
@@ -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;
 }