libhydra: Remove empty unused library
This commit is contained in:
-1
@@ -848,7 +848,6 @@ public class CharonVpnService extends VpnService implements Runnable
|
||||
System.loadLibrary("imcv");
|
||||
}
|
||||
|
||||
System.loadLibrary("hydra");
|
||||
System.loadLibrary("charon");
|
||||
System.loadLibrary("ipsec");
|
||||
}
|
||||
|
||||
@@ -71,7 +71,6 @@ strongswan_BUILD := \
|
||||
libandroidbridge \
|
||||
strongswan/src/libipsec \
|
||||
strongswan/src/libcharon \
|
||||
strongswan/src/libhydra \
|
||||
strongswan/src/libstrongswan
|
||||
|
||||
ifneq ($(strongswan_USE_BYOD),)
|
||||
|
||||
@@ -25,7 +25,6 @@ endif
|
||||
|
||||
LOCAL_C_INCLUDES += \
|
||||
$(strongswan_PATH)/src/libipsec \
|
||||
$(strongswan_PATH)/src/libhydra \
|
||||
$(strongswan_PATH)/src/libcharon \
|
||||
$(strongswan_PATH)/src/libstrongswan
|
||||
|
||||
@@ -54,7 +53,7 @@ LOCAL_PRELINK_MODULE := false
|
||||
|
||||
LOCAL_LDLIBS := -llog
|
||||
|
||||
LOCAL_SHARED_LIBRARIES := libstrongswan libhydra libipsec libcharon
|
||||
LOCAL_SHARED_LIBRARIES := libstrongswan libipsec libcharon
|
||||
|
||||
ifneq ($(strongswan_USE_BYOD),)
|
||||
LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs
|
||||
|
||||
@@ -37,7 +37,6 @@ static struct {
|
||||
{ "libtnccs.so", NULL },
|
||||
{ "libimcv.so", NULL },
|
||||
#endif
|
||||
{ "libhydra.so", NULL },
|
||||
{ "libcharon.so", NULL },
|
||||
{ "libipsec.so", NULL },
|
||||
};
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
#endif
|
||||
|
||||
#include <daemon.h>
|
||||
#include <hydra.h>
|
||||
#include <ipsec.h>
|
||||
#include <library.h>
|
||||
#include <threading/thread.h>
|
||||
@@ -606,17 +605,9 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
|
||||
set_options(logfile);
|
||||
free(logfile);
|
||||
|
||||
if (!libhydra_init())
|
||||
{
|
||||
libhydra_deinit();
|
||||
library_deinit();
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (!libipsec_init())
|
||||
{
|
||||
libipsec_deinit();
|
||||
libhydra_deinit();
|
||||
library_deinit();
|
||||
return FALSE;
|
||||
}
|
||||
@@ -625,7 +616,6 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
|
||||
{
|
||||
libcharon_deinit();
|
||||
libipsec_deinit();
|
||||
libhydra_deinit();
|
||||
library_deinit();
|
||||
return FALSE;
|
||||
}
|
||||
@@ -657,7 +647,6 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
|
||||
libcharon_deinit();
|
||||
charonservice_deinit(env);
|
||||
libipsec_deinit();
|
||||
libhydra_deinit();
|
||||
library_deinit();
|
||||
return FALSE;
|
||||
}
|
||||
@@ -687,7 +676,6 @@ JNI_METHOD(CharonVpnService, deinitializeCharon, void)
|
||||
libcharon_deinit();
|
||||
charonservice_deinit(env);
|
||||
libipsec_deinit();
|
||||
libhydra_deinit();
|
||||
library_deinit();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user