Skip to content

Commit

Permalink
update android target API to 28, use gradle and ndk parallel building
Browse files Browse the repository at this point in the history
  • Loading branch information
r4sas committed Jul 20, 2018
1 parent cb1e47e commit 2406d57
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
78 changes: 0 additions & 78 deletions android/assets/i2pd.conf

This file was deleted.

78 changes: 78 additions & 0 deletions android/assets/i2pd.conf
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions android/assets/subscriptions.txt

This file was deleted.

3 changes: 3 additions & 0 deletions android/assets/subscriptions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
http://inr.i2p/export/alive-hosts.txt
http://stats.i2p/cgi-bin/newhosts.txt
http://i2p-projekt.i2p/hosts.txt
33 changes: 0 additions & 33 deletions android/assets/tunnels.conf

This file was deleted.

33 changes: 33 additions & 0 deletions android/assets/tunnels.conf
Original file line number Diff line number Diff line change
@@ -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/
13 changes: 9 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.gradle.parallel=true
2 changes: 1 addition & 1 deletion android/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-25
target=android-28
1 change: 1 addition & 0 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = "i2pd"

0 comments on commit 2406d57

Please sign in to comment.