android: Make sure libtpmtss is loaded on older systems

On newer Android systems this seems to happen automatically (or does at
least not cause crashes if the library is not loaded).
This commit is contained in:
Tobias Brunner committed 2016-12-09 11:16:42 +01:00
1 parent 708f9c7f65
commit 9920824e70
3 files changed
+3 -1

No files matched your search

@@ -943,6 +943,7 @@ public class CharonVpnService extends VpnService implements Runnable, VpnStateSe
if (MainActivity.USE_BYOD)
{
System.loadLibrary("tpmtss");
System.loadLibrary("tncif");
System.loadLibrary("tnccs");
System.loadLibrary("imcv");
@@ -57,7 +57,7 @@ LOCAL_LDLIBS := -llog
LOCAL_SHARED_LIBRARIES := libstrongswan libipsec libcharon
ifneq ($(strongswan_USE_BYOD),)
LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs
LOCAL_SHARED_LIBRARIES += libimcv libtncif libtnccs libtpmtss
endif
include $(BUILD_SHARED_LIBRARY)
@@ -33,6 +33,7 @@ static struct {
} libs[] = {
{ "libstrongswan.so", NULL },
#ifdef USE_BYOD
{ "libtpmtss.so", NULL },
{ "libtncif.so", NULL },
{ "libtnccs.so", NULL },
{ "libimcv.so", NULL },