summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-08-24 11:02:18 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-08-24 11:02:18 -0300
commit5b7ad58b5e7dc7f32446ee815d0f33db2e0c6eee (patch)
tree23ca0a8a499c1369648d803d082c5f5b6a16a056 /android
parentc85a6908d8c2a085a6100e6053ffffd7861e98e2 (diff)
parent163029ce0a78b1e8bcdcc932d16632b0bfe49545 (diff)
downloadmullvadvpn-5b7ad58b5e7dc7f32446ee815d0f33db2e0c6eee.tar.xz
mullvadvpn-5b7ad58b5e7dc7f32446ee815d0f33db2e0c6eee.zip
Merge branch 'load-jni-library-sooner'
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt4
1 files changed, 4 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 17003b5440..6ba1a42c1e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -28,6 +28,10 @@ class MullvadVpnService : TalpidVpnService() {
val KEY_CONNECT_ACTION = "net.mullvad.mullvadvpn.connect_action"
val KEY_DISCONNECT_ACTION = "net.mullvad.mullvadvpn.disconnect_action"
+
+ init {
+ System.loadLibrary("mullvad_jni")
+ }
}
private enum class PendingAction {