diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-11 01:00:35 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-11 01:00:35 -0300 |
| commit | 14d227892a2e5de8045ec185188a69ad7ada8813 (patch) | |
| tree | 9ffd9efb92a1ddd5528514b614e01674378fb21c /android | |
| parent | a265fc596b7b2fca79592b494d6e3a55034bfbe2 (diff) | |
| parent | 76de34848a130d44831d5e57ddb56f13fb570bea (diff) | |
| download | mullvadvpn-14d227892a2e5de8045ec185188a69ad7ada8813.tar.xz mullvadvpn-14d227892a2e5de8045ec185188a69ad7ada8813.zip | |
Merge branch 'wireguard-on-android'
Diffstat (limited to 'android')
| -rw-r--r-- | android/build.gradle | 7 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/android/build.gradle b/android/build.gradle index d511691624..914ee21e88 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -46,6 +46,7 @@ android { variant.ndkCompileProvider.configure { dependsOn copyMullvadJni + dependsOn copyWireguardGo } } } @@ -99,6 +100,12 @@ task copyMullvadJni(type: Copy) { into "$extraJniDirectory/arm64-v8a" } +task copyWireguardGo(type: Copy) { + from "$repoRootPath/dist-assets/binaries/android" + include 'libwg.so' + into "$extraJniDirectory/arm64-v8a" +} + task copyApiRootCertificate(type: Copy) { from "$repoRootPath/dist-assets" include "api_root_ca.pem" diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt index dcd4935ee4..ec71738ef2 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt @@ -66,7 +66,7 @@ class MullvadVpnService(val context: Context) { } for (route in config.routes) { - addRoute(route.address, route.prefixLength as Int) + addRoute(route.address, route.prefixLength.toInt()) } setMtu(config.mtu) |