android: Remove references to libpts
authorTobias Brunner <tobias@strongswan.org>
Mon, 13 Oct 2014 15:18:06 +0000 (17:18 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 13 Oct 2014 15:18:06 +0000 (17:18 +0200)
src/frontends/android/jni/Android.mk
src/frontends/android/jni/libandroidbridge/Android.mk
src/frontends/android/jni/libandroidbridge/byod/imc_android.c

index d09a489..2af0d24 100644 (file)
@@ -77,8 +77,7 @@ ifneq ($(strongswan_USE_BYOD),)
 strongswan_BUILD += \
        strongswan/src/libtnccs \
        strongswan/src/libtncif \
 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, \
 endif
 
 include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \
index 9c4561c..c56b8d5 100644 (file)
@@ -34,7 +34,6 @@ LOCAL_C_INCLUDES += \
        $(strongswan_PATH)/src/libimcv \
        $(strongswan_PATH)/src/libtncif \
        $(strongswan_PATH)/src/libtnccs \
        $(strongswan_PATH)/src/libimcv \
        $(strongswan_PATH)/src/libtncif \
        $(strongswan_PATH)/src/libtnccs \
-       $(strongswan_PATH)/src/libpts \
        $(strongswan_PATH)/src/libtls
 endif
 
        $(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 := 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)
 endif
 
 include $(BUILD_SHARED_LIBRARY)
index 1c6d594..119d2a5 100644 (file)
@@ -21,7 +21,6 @@
 #include "../charonservice.h"
 
 #include <tnc/tnc.h>
 #include "../charonservice.h"
 
 #include <tnc/tnc.h>
-#include <libpts.h>
 #include <imcv.h>
 #include <imc/imc_agent.h>
 #include <imc/imc_msg.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;
        }
 
                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");
        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;
        }
        imc_android->destroy(imc_android);
        imc_android = NULL;
-       libpts_deinit();
        return TNC_RESULT_SUCCESS;
 }
 
        return TNC_RESULT_SUCCESS;
 }