42 files changed, 76 insertions, 44 deletions
diff --git a/.gitmodules b/.gitmodules
index 77b129f7..46c0abd5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "app/tools/wireguard-tools"]
-	path = app/tools/wireguard-tools
+[submodule "tunnel/tools/wireguard-tools"]
+	path = tunnel/tools/wireguard-tools
 	url = https://git.zx2c4.com/wireguard-tools
diff --git a/app/build.gradle b/app/build.gradle
index a32d14f0..a21c2027 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -65,51 +65,21 @@ android {
             }
         }
     }
-    externalNativeBuild {
-        cmake {
-            path 'tools/CMakeLists.txt'
-        }
-    }
-}
-
-ext {
-    annotationsVersion = '1.1.0'
-    appcompatVersion = '1.1.0'
-    cardviewVersion = '1.0.0'
-    coreKtxVersion = '1.2.0'
-    constraintLayoutVersion = '1.1.3'
-    coordinatorLayoutVersion = '1.1.0'
-    databindingVersion = '3.6.0'
-    fragmentVersion = '1.2.2'
-    materialComponentsVersion = '1.1.0'
-    jsr305Version = '3.0.2'
-    kotlinVersion = '1.3.70'
-    preferenceVersion = '1.1.0'
-    streamsupportVersion = '1.7.1'
-    threetenabpVersion = '1.2.2'
-    // ZXING switched minSdk to 24 so we cannot upgrade to 4.0.2 without following suit.
-    // If you choose to upgrade to minSDK 24 then you should also disable Jetifier from
-    // gradle.properties.
-    zxingEmbeddedVersion = '3.6.0'
-    eddsaVersion = '0.3.0'
 }
 
 dependencies {
+    implementation project(":tunnel")
     implementation "androidx.annotation:annotation:$annotationsVersion"
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation "androidx.cardview:cardview:$cardviewVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
     implementation "androidx.coordinatorlayout:coordinatorlayout:$coordinatorLayoutVersion"
     implementation "androidx.core:core-ktx:$coreKtxVersion"
-    implementation "androidx.databinding:databinding-runtime:$databindingVersion"
+    implementation "androidx.databinding:databinding-runtime:$agpVersion"
     implementation "androidx.fragment:fragment:$fragmentVersion"
     implementation "androidx.preference:preference:$preferenceVersion"
     implementation "com.google.android.material:material:$materialComponentsVersion"
-    implementation "com.google.code.findbugs:jsr305:$jsr305Version"
-    implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
     implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion"
-    implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
-    implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
     implementation "net.i2p.crypto:eddsa:$eddsaVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4bcb7588..5e993ae2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -74,14 +74,6 @@
         </receiver>
 
         <service
-            android:name=".backend.GoBackend$VpnService"
-            android:permission="android.permission.BIND_VPN_SERVICE">
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
-        </service>
-
-        <service
             android:name=".QuickTileService"
             android:icon="@drawable/ic_tile"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
diff --git a/build.gradle b/build.gradle
index 07abd269..01ab9af5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,9 +6,31 @@ allprojects {
 }
 
 buildscript {
+    ext {
+        annotationsVersion = '1.1.0'
+        appcompatVersion = '1.1.0'
+        cardviewVersion = '1.0.0'
+        collectionVersion = '1.1.0'
+        coreKtxVersion = '1.2.0'
+        constraintLayoutVersion = '1.1.3'
+        coordinatorLayoutVersion = '1.1.0'
+        agpVersion = '3.6.1'
+        fragmentVersion = '1.2.2'
+        materialComponentsVersion = '1.1.0'
+        jsr305Version = '3.0.2'
+        kotlinVersion = '1.3.70'
+        preferenceVersion = '1.1.0'
+        streamsupportVersion = '1.7.1'
+        threetenabpVersion = '1.2.2'
+        // ZXING switched minSdk to 24 so we cannot upgrade to 4.0.2 without following suit.
+        // If you choose to upgrade to minSDK 24 then you should also disable Jetifier from
+        // gradle.properties.
+        zxingEmbeddedVersion = '3.6.0'
+        eddsaVersion = '0.3.0'
+    }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70'
+        classpath "com.android.tools.build:gradle:$agpVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
     repositories {
         google()
diff --git a/settings.gradle b/settings.gradle
index e7b4def4..748da187 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':app'
+include ':tunnel'
diff --git a/tunnel/build.gradle b/tunnel/build.gradle
new file mode 100644
index 00000000..65ac6ceb
--- /dev/null
+++ b/tunnel/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+
+android {
+    buildToolsVersion '29.0.3'
+    compileSdkVersion 29
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode 1
+        versionName '1.0'
+    }
+    externalNativeBuild {
+        cmake {
+            path 'tools/CMakeLists.txt'
+        }
+    }
+}
+
+dependencies {
+    api "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
+    api "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
+    api "com.google.code.findbugs:jsr305:$jsr305Version"
+    implementation "androidx.annotation:annotation:$annotationsVersion"
+    implementation "androidx.collection:collection:$collectionVersion"
+    implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
+}
diff --git a/tunnel/src/main/AndroidManifest.xml b/tunnel/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..111e5e2d
--- /dev/null
+++ b/tunnel/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<!--
+  ~ Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.wireguard.android.tunnel">
+    <application>
+            <service
+            android:name="com.wireguard.android.backend.GoBackend$VpnService"
+            android:permission="android.permission.BIND_VPN_SERVICE">
+            <intent-filter>
+                <action android:name="android.net.VpnService" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>
diff --git a/app/src/main/java/com/wireguard/android/backend/Backend.java b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
index ed3a5ebd..ed3a5ebd 100644
--- a/app/src/main/java/com/wireguard/android/backend/Backend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Backend.java
diff --git a/app/src/main/java/com/wireguard/android/backend/BackendException.java b/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java
index e1e8eaa9..e1e8eaa9 100644
--- a/app/src/main/java/com/wireguard/android/backend/BackendException.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/BackendException.java
diff --git a/app/src/main/java/com/wireguard/android/backend/GoBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
index 6ad5afa4..6ad5afa4 100644
--- a/app/src/main/java/com/wireguard/android/backend/GoBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
diff --git a/app/src/main/java/com/wireguard/android/backend/Statistics.java b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
index 2ca87d23..2ca87d23 100644
--- a/app/src/main/java/com/wireguard/android/backend/Statistics.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
diff --git a/app/src/main/java/com/wireguard/android/backend/Tunnel.java b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
index af2f59f7..af2f59f7 100644
--- a/app/src/main/java/com/wireguard/android/backend/Tunnel.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Tunnel.java
diff --git a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
index 9695aab7..9695aab7 100644
--- a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
diff --git a/app/src/main/java/com/wireguard/android/util/AsyncWorker.java b/tunnel/src/main/java/com/wireguard/android/util/AsyncWorker.java
index 1d041851..1d041851 100644
--- a/app/src/main/java/com/wireguard/android/util/AsyncWorker.java
+++ b/tunnel/src/main/java/com/wireguard/android/util/AsyncWorker.java
diff --git a/app/src/main/java/com/wireguard/android/util/RootShell.java b/tunnel/src/main/java/com/wireguard/android/util/RootShell.java
index 1fc2c9f2..1fc2c9f2 100644
--- a/app/src/main/java/com/wireguard/android/util/RootShell.java
+++ b/tunnel/src/main/java/com/wireguard/android/util/RootShell.java
diff --git a/app/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java b/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
index 93e44b64..93e44b64 100644
--- a/app/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
+++ b/tunnel/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
diff --git a/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java b/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java
index ac18cabf..ac18cabf 100644
--- a/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java
+++ b/tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java
diff --git a/app/src/main/java/com/wireguard/config/Attribute.java b/tunnel/src/main/java/com/wireguard/config/Attribute.java
index 1e9e25f0..1e9e25f0 100644
--- a/app/src/main/java/com/wireguard/config/Attribute.java
+++ b/tunnel/src/main/java/com/wireguard/config/Attribute.java
diff --git a/app/src/main/java/com/wireguard/config/BadConfigException.java b/tunnel/src/main/java/com/wireguard/config/BadConfigException.java
index 6d41b065..6d41b065 100644
--- a/app/src/main/java/com/wireguard/config/BadConfigException.java
+++ b/tunnel/src/main/java/com/wireguard/config/BadConfigException.java
diff --git a/app/src/main/java/com/wireguard/config/Config.java b/tunnel/src/main/java/com/wireguard/config/Config.java
index 62651b08..62651b08 100644
--- a/app/src/main/java/com/wireguard/config/Config.java
+++ b/tunnel/src/main/java/com/wireguard/config/Config.java
diff --git a/app/src/main/java/com/wireguard/config/InetAddresses.java b/tunnel/src/main/java/com/wireguard/config/InetAddresses.java
index 5303e27f..5303e27f 100644
--- a/app/src/main/java/com/wireguard/config/InetAddresses.java
+++ b/tunnel/src/main/java/com/wireguard/config/InetAddresses.java
diff --git a/app/src/main/java/com/wireguard/config/InetEndpoint.java b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
index a442258e..a442258e 100644
--- a/app/src/main/java/com/wireguard/config/InetEndpoint.java
+++ b/tunnel/src/main/java/com/wireguard/config/InetEndpoint.java
diff --git a/app/src/main/java/com/wireguard/config/InetNetwork.java b/tunnel/src/main/java/com/wireguard/config/InetNetwork.java
index f89322fd..f89322fd 100644
--- a/app/src/main/java/com/wireguard/config/InetNetwork.java
+++ b/tunnel/src/main/java/com/wireguard/config/InetNetwork.java
diff --git a/app/src/main/java/com/wireguard/config/Interface.java b/tunnel/src/main/java/com/wireguard/config/Interface.java
index 54944424..54944424 100644
--- a/app/src/main/java/com/wireguard/config/Interface.java
+++ b/tunnel/src/main/java/com/wireguard/config/Interface.java
diff --git a/app/src/main/java/com/wireguard/config/ParseException.java b/tunnel/src/main/java/com/wireguard/config/ParseException.java
index c79d1fa1..c79d1fa1 100644
--- a/app/src/main/java/com/wireguard/config/ParseException.java
+++ b/tunnel/src/main/java/com/wireguard/config/ParseException.java
diff --git a/app/src/main/java/com/wireguard/config/Peer.java b/tunnel/src/main/java/com/wireguard/config/Peer.java
index 37fcfa69..37fcfa69 100644
--- a/app/src/main/java/com/wireguard/config/Peer.java
+++ b/tunnel/src/main/java/com/wireguard/config/Peer.java
diff --git a/app/src/main/java/com/wireguard/crypto/Curve25519.java b/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java
index 5622fc5f..5622fc5f 100644
--- a/app/src/main/java/com/wireguard/crypto/Curve25519.java
+++ b/tunnel/src/main/java/com/wireguard/crypto/Curve25519.java
diff --git a/app/src/main/java/com/wireguard/crypto/Key.java b/tunnel/src/main/java/com/wireguard/crypto/Key.java
index 6648a5f3..6648a5f3 100644
--- a/app/src/main/java/com/wireguard/crypto/Key.java
+++ b/tunnel/src/main/java/com/wireguard/crypto/Key.java
diff --git a/app/src/main/java/com/wireguard/crypto/KeyFormatException.java b/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java
index 5818b4d4..5818b4d4 100644
--- a/app/src/main/java/com/wireguard/crypto/KeyFormatException.java
+++ b/tunnel/src/main/java/com/wireguard/crypto/KeyFormatException.java
diff --git a/app/src/main/java/com/wireguard/crypto/KeyPair.java b/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java
index f8238e91..f8238e91 100644
--- a/app/src/main/java/com/wireguard/crypto/KeyPair.java
+++ b/tunnel/src/main/java/com/wireguard/crypto/KeyPair.java
diff --git a/app/src/main/java/com/wireguard/util/NonNullForAll.java b/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java
index f179fa49..f179fa49 100644
--- a/app/src/main/java/com/wireguard/util/NonNullForAll.java
+++ b/tunnel/src/main/java/com/wireguard/util/NonNullForAll.java
diff --git a/app/tools/CMakeLists.txt b/tunnel/tools/CMakeLists.txt
index 90e61a06..90e61a06 100644
--- a/app/tools/CMakeLists.txt
+++ b/tunnel/tools/CMakeLists.txt
diff --git a/app/tools/libwg-go/.gitignore b/tunnel/tools/libwg-go/.gitignore
index d1638636..d1638636 100644
--- a/app/tools/libwg-go/.gitignore
+++ b/tunnel/tools/libwg-go/.gitignore
diff --git a/app/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile
index 5c46df52..5c46df52 100644
--- a/app/tools/libwg-go/Makefile
+++ b/tunnel/tools/libwg-go/Makefile
diff --git a/app/tools/libwg-go/api-android.go b/tunnel/tools/libwg-go/api-android.go
index 7a393cae..7a393cae 100644
--- a/app/tools/libwg-go/api-android.go
+++ b/tunnel/tools/libwg-go/api-android.go
diff --git a/app/tools/libwg-go/go.mod b/tunnel/tools/libwg-go/go.mod
index a5bd709b..a5bd709b 100644
--- a/app/tools/libwg-go/go.mod
+++ b/tunnel/tools/libwg-go/go.mod
diff --git a/app/tools/libwg-go/go.sum b/tunnel/tools/libwg-go/go.sum
index 25d8f90c..25d8f90c 100644
--- a/app/tools/libwg-go/go.sum
+++ b/tunnel/tools/libwg-go/go.sum
diff --git a/app/tools/libwg-go/goruntime-boottime-over-monotonic.diff b/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff
index 5fd02397..5fd02397 100644
--- a/app/tools/libwg-go/goruntime-boottime-over-monotonic.diff
+++ b/tunnel/tools/libwg-go/goruntime-boottime-over-monotonic.diff
diff --git a/app/tools/libwg-go/jni.c b/tunnel/tools/libwg-go/jni.c
index 3f877d47..3f877d47 100644
--- a/app/tools/libwg-go/jni.c
+++ b/tunnel/tools/libwg-go/jni.c
diff --git a/app/tools/ndk-compat/compat.c b/tunnel/tools/ndk-compat/compat.c
index 7cc99fc4..7cc99fc4 100644
--- a/app/tools/ndk-compat/compat.c
+++ b/tunnel/tools/ndk-compat/compat.c
diff --git a/app/tools/ndk-compat/compat.h b/tunnel/tools/ndk-compat/compat.h
index 52f6c127..52f6c127 100644
--- a/app/tools/ndk-compat/compat.h
+++ b/tunnel/tools/ndk-compat/compat.h
diff --git a/app/tools/wireguard-tools b/tunnel/tools/wireguard-tools
-Subproject e5b08c2849256367fc6bf37be9e737bdb21ee66
+Subproject e5b08c2849256367fc6bf37be9e737bdb21ee66