diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2016-12-09 11:16:42 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-12-09 11:16:42 +0100 |
| commit | 9920824e70009bb1cfac012b600ffcf7671a3b5b (patch) | |
| tree | 90138efc2e2196ae18ea2ec01cc0057150e59058 | |
| parent | 708f9c7f6557e07fb78c014ec6ca4ec34de05926 (diff) | |
| download | strongswan-9920824e70009bb1cfac012b600ffcf7671a3b5b.tar.bz2 strongswan-9920824e70009bb1cfac012b600ffcf7671a3b5b.tar.xz | |
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).
3 files changed, 3 insertions, 1 deletions
diff --git a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java index 0048a2daf..9e9b6733a 100644 --- a/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java +++ b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java @@ -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"); diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk b/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk index 8c4224e56..c37210d49 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk @@ -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) diff --git a/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c b/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c index eaba85d4e..fb973a8df 100644 --- a/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c +++ b/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c @@ -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 }, |