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

libhydra: Remove empty unused library

Browse Source
This commit is contained in:
Tobias Brunner
2016-03-03 17:36:11 +01:00
parent 8394ea2a42
commit 28649f6d91
125 changed files with 26 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
-1
View File
@@ -848,7 +848,6 @@ public class CharonVpnService extends VpnService implements Runnable
System.loadLibrary("imcv");
}
System.loadLibrary("hydra");
System.loadLibrary("charon");
System.loadLibrary("ipsec");
}
src/frontends/android/app/src/main/jni/Android.mk
-1
View File
@@ -71,7 +71,6 @@ strongswan_BUILD := \
libandroidbridge \
strongswan/src/libipsec \
strongswan/src/libcharon \
strongswan/src/libhydra \
strongswan/src/libstrongswan
ifneq ($(strongswan_USE_BYOD),)
src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk
+1 -2
View File
@@ -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
src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c
-1
View File
@@ -37,7 +37,6 @@ static struct {
{ "libtnccs.so", NULL },
{ "libimcv.so", NULL },
#endif
{ "libhydra.so", NULL },
{ "libcharon.so", NULL },
{ "libipsec.so", NULL },
};
src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c
-12
View File
@@ -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();
}
src/frontends/osx/charon-xpc/charon-xpc.c
-6
View File
@@ -22,7 +22,6 @@
#include <errno.h>
#include <library.h>
#include <hydra.h>
#include <daemon.h>
#include <threading/thread.h>
#include <utils/backtrace.h>
@@ -170,11 +169,6 @@ int main(int argc, char *argv[])
exit(SS_RC_DAEMON_INTEGRITY);
}
}
atexit(libhydra_deinit);
if (!libhydra_init())
{
exit(SS_RC_INITIALIZATION_FAILED);
}
atexit(libcharon_deinit);
if (!libcharon_init())
{
src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
-8
View File
@@ -478,7 +478,6 @@
/usr/include,
../../libstrongswan,
../../libcharon,
../../libhydra,
);
INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
INSTALL_PATH = /;
@@ -486,7 +485,6 @@
/usr/lib,
../../libstrongswan/.libs,
../../libcharon/.libs,
../../libhydra/.libs,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = (
@@ -500,8 +498,6 @@
"-force_load",
../../libipsec/.libs/libipsec.a,
"-force_load",
../../libhydra/.libs/libhydra.a,
"-force_load",
../../libcharon/.libs/libcharon.a,
"-sectcreate",
__TEXT,
@@ -531,7 +527,6 @@
/usr/include,
../../libstrongswan,
../../libcharon,
../../libhydra,
);
INFOPLIST_FILE = "charon-xpc/charon-xpc-Info.plist";
INSTALL_PATH = /;
@@ -539,7 +534,6 @@
/usr/lib,
../../libstrongswan/.libs,
../../libcharon/.libs,
../../libhydra/.libs,
);
MACOSX_DEPLOYMENT_TARGET = 10.7;
OTHER_CFLAGS = (
@@ -553,8 +547,6 @@
"-force_load",
../../libipsec/.libs/libipsec.a,
"-force_load",
../../libhydra/.libs/libhydra.a,
"-force_load",
../../libcharon/.libs/libcharon.a,
"-sectcreate",
__TEXT,