diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index ca66c17d..705cce4e 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="25" />
+        android:targetSdkVersion="28" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" /> <!-- normal perm, per https://developer.android.com/guide/topics/permissions/normal-permissions.html -->
diff --git a/android/assets/i2pd.conf b/android/assets/i2pd.conf
deleted file mode 120000
index 8022b3d9..00000000
--- a/android/assets/i2pd.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-## Configuration file for a typical i2pd user
-## See https://i2pd.readthedocs.org/en/latest/configuration.html
-## for more options you can use in this file.
-
-#logfile = /sdcard/i2pd/i2pd.log
-loglevel = none
-
-# host = 1.2.3.4
-# port = 4567
-
-ipv4 = true
-ipv6 = false
-
-# ntcp = true
-# ntcpproxy = http://127.0.0.1:8118
-# ssu = true
-
-bandwidth = O
-# share = 100
-
-# notransit = true
-# floodfill = true
-
-[http]
-enabled = true
-address = 127.0.0.1
-port = 7070
-# auth = true
-# user = i2pd
-# pass = changeme
-
-[httpproxy]
-enabled = true
-address = 127.0.0.1
-port = 4444
-# keys = http-proxy-keys.dat
-# addresshelper = true
-# outproxy = http://false.i2p
-## httpproxy section also accepts I2CP parameters, like "inbound.length" etc.
-
-[socksproxy]
-enabled = true
-address = 127.0.0.1
-port = 4447
-# keys = socks-proxy-keys.dat
-# outproxy.enabled = false
-# outproxy = 127.0.0.1
-# outproxyport = 9050
-## socksproxy section also accepts I2CP parameters, like "inbound.length" etc.
-
-[sam]
-enabled = false
-# address = 127.0.0.1
-# port = 7656
-
-[precomputation]
-elgamal = true
-
-[upnp]
-enabled = true
-# name = I2Pd
-
-[reseed]
-verify = true
-## Path to local reseed data file (.su3) for manual reseeding
-# file = /path/to/i2pseeds.su3
-## or HTTPS URL to reseed from
-# file = https://legit-website.com/i2pseeds.su3
-## Path to local ZIP file or HTTPS URL to reseed from
-# zipfile = /path/to/netDb.zip
-## If you run i2pd behind a proxy server, set proxy server for reseeding here
-## Should be http://address:port or socks://address:port
-# proxy = http://127.0.0.1:8118
-## Minimum number of known routers, below which i2pd triggers reseeding. 25 by default
-# threshold = 25
-
-[limits]
-transittunnels = 50
diff --git a/android/assets/i2pd.conf b/android/assets/i2pd.conf
new file mode 100644
index 00000000..8022b3d9
--- /dev/null
+++ b/android/assets/i2pd.conf
@@ -0,0 +1,78 @@
+## Configuration file for a typical i2pd user
+## See https://i2pd.readthedocs.org/en/latest/configuration.html
+## for more options you can use in this file.
+
+#logfile = /sdcard/i2pd/i2pd.log
+loglevel = none
+
+# host = 1.2.3.4
+# port = 4567
+
+ipv4 = true
+ipv6 = false
+
+# ntcp = true
+# ntcpproxy = http://127.0.0.1:8118
+# ssu = true
+
+bandwidth = O
+# share = 100
+
+# notransit = true
+# floodfill = true
+
+[http]
+enabled = true
+address = 127.0.0.1
+port = 7070
+# auth = true
+# user = i2pd
+# pass = changeme
+
+[httpproxy]
+enabled = true
+address = 127.0.0.1
+port = 4444
+# keys = http-proxy-keys.dat
+# addresshelper = true
+# outproxy = http://false.i2p
+## httpproxy section also accepts I2CP parameters, like "inbound.length" etc.
+
+[socksproxy]
+enabled = true
+address = 127.0.0.1
+port = 4447
+# keys = socks-proxy-keys.dat
+# outproxy.enabled = false
+# outproxy = 127.0.0.1
+# outproxyport = 9050
+## socksproxy section also accepts I2CP parameters, like "inbound.length" etc.
+
+[sam]
+enabled = false
+# address = 127.0.0.1
+# port = 7656
+
+[precomputation]
+elgamal = true
+
+[upnp]
+enabled = true
+# name = I2Pd
+
+[reseed]
+verify = true
+## Path to local reseed data file (.su3) for manual reseeding
+# file = /path/to/i2pseeds.su3
+## or HTTPS URL to reseed from
+# file = https://legit-website.com/i2pseeds.su3
+## Path to local ZIP file or HTTPS URL to reseed from
+# zipfile = /path/to/netDb.zip
+## If you run i2pd behind a proxy server, set proxy server for reseeding here
+## Should be http://address:port or socks://address:port
+# proxy = http://127.0.0.1:8118
+## Minimum number of known routers, below which i2pd triggers reseeding. 25 by default
+# threshold = 25
+
+[limits]
+transittunnels = 50
diff --git a/android/assets/subscriptions.txt b/android/assets/subscriptions.txt
deleted file mode 120000
index 8f4afb03..00000000
--- a/android/assets/subscriptions.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-http://inr.i2p/export/alive-hosts.txt
-http://stats.i2p/cgi-bin/newhosts.txt
-http://i2p-projekt.i2p/hosts.txt
diff --git a/android/assets/subscriptions.txt b/android/assets/subscriptions.txt
new file mode 100644
index 00000000..8f4afb03
--- /dev/null
+++ b/android/assets/subscriptions.txt
@@ -0,0 +1,3 @@
+http://inr.i2p/export/alive-hosts.txt
+http://stats.i2p/cgi-bin/newhosts.txt
+http://i2p-projekt.i2p/hosts.txt
diff --git a/android/assets/tunnels.conf b/android/assets/tunnels.conf
deleted file mode 120000
index e95fdf2e..00000000
--- a/android/assets/tunnels.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-[IRC-IRC2P]
-#type = client
-#address = 127.0.0.1
-#port = 6668
-#destination = irc.postman.i2p
-#destinationport = 6667
-#keys = irc-keys.dat
-
-#[IRC-ILITA]
-#type = client
-#address = 127.0.0.1
-#port = 6669
-#destination = irc.ilita.i2p
-#destinationport = 6667
-#keys = irc-keys.dat
-
-#[SMTP]
-#type = client
-#address = 127.0.0.1
-#port = 7659
-#destination = smtp.postman.i2p
-#destinationport = 25
-#keys = smtp-keys.dat
-
-#[POP3]
-#type = client
-#address = 127.0.0.1
-#port = 7660
-#destination = pop.postman.i2p
-#destinationport = 110
-#keys = pop3-keys.dat
-
-# see more examples at https://i2pd.readthedocs.io/en/latest/user-guide/tunnels/
diff --git a/android/assets/tunnels.conf b/android/assets/tunnels.conf
new file mode 100644
index 00000000..e95fdf2e
--- /dev/null
+++ b/android/assets/tunnels.conf
@@ -0,0 +1,33 @@
+[IRC-IRC2P]
+#type = client
+#address = 127.0.0.1
+#port = 6668
+#destination = irc.postman.i2p
+#destinationport = 6667
+#keys = irc-keys.dat
+
+#[IRC-ILITA]
+#type = client
+#address = 127.0.0.1
+#port = 6669
+#destination = irc.ilita.i2p
+#destinationport = 6667
+#keys = irc-keys.dat
+
+#[SMTP]
+#type = client
+#address = 127.0.0.1
+#port = 7659
+#destination = smtp.postman.i2p
+#destinationport = 25
+#keys = smtp-keys.dat
+
+#[POP3]
+#type = client
+#address = 127.0.0.1
+#port = 7660
+#destination = pop.postman.i2p
+#destinationport = 110
+#keys = pop3-keys.dat
+
+# see more examples at https://i2pd.readthedocs.io/en/latest/user-guide/tunnels/
diff --git a/android/build.gradle b/android/build.gradle
index 683f3d27..2a8ad6f4 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -18,17 +18,22 @@ repositories {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.1"
     defaultConfig {
         applicationId "org.purplei2p.i2pd"
-        targetSdkVersion 25
+        targetSdkVersion 28
         minSdkVersion 14
         versionCode 1
         versionName "2.19.0"
         ndk {
             abiFilters 'armeabi-v7a'
-            //abiFilters 'x86'
+            abiFilters 'x86'
+        }
+        externalNativeBuild {
+            ndkBuild {
+                arguments "-j4"
+            }
         }
     }
     sourceSets {
diff --git a/android/gradle.properties b/android/gradle.properties
new file mode 100644
index 00000000..af82e006
--- /dev/null
+++ b/android/gradle.properties
@@ -0,0 +1 @@
+org.gradle.parallel=true
\ No newline at end of file
diff --git a/android/project.properties b/android/project.properties
index f72b9716..919ca9c3 100644
--- a/android/project.properties
+++ b/android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-25
+target=android-28
diff --git a/android/settings.gradle b/android/settings.gradle
new file mode 100644
index 00000000..2a620ef9
--- /dev/null
+++ b/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "i2pd"