Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use jna aar #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use jna aar #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f141b2
Use JNA aar rather than manually bundling native libraries
desyncr Sep 4, 2020
9e891e3
Excluding jna from android build
desyncr Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,6 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

sourceSets {
main {
jniLibs.srcDirs = ["libs"]
}
}
}

advancedVersioning {
Expand All @@ -50,8 +44,6 @@ advancedVersioning {
}

repositories {
mavenLocal()
maven { url 'https://mvn.freenetproject.org' }
jcenter()
maven { url 'https://jitpack.io' }
}
Expand Down Expand Up @@ -86,8 +78,17 @@ dependencies {
implementation 'com.github.freenet-mobile:onion-common:0.0.3'
implementation 'com.github.freenet-mobile:onion-fec:0.0.4'
implementation 'com.github.freenet-mobile:freenet-ext:0.60.3'
implementation 'com.github.freenet-mobile:fred:1486.5m'
implementation 'com.github.desyncr:plugin-sharesite:0.4.7.3m'

implementation 'net.java.dev.jna:jna:4.5.2@aar'
implementation ('com.github.freenet-mobile:fred:1486.7m') {
exclude group: 'net.java.dev.jna', module: 'jna'
exclude group: 'net.java.dev.jna', module: 'jna-platform'
}

implementation ('com.github.desyncr:plugin-sharesite:0.4.7.4m') {
exclude group: 'net.java.dev.jna', module: 'jna'
exclude group: 'net.java.dev.jna', module: 'jna-platform'
}

// For running a locally built freenet.jar
//implementation "net.java.dev.jna:jna:4.5.2"
Expand Down
Binary file removed app/libs/arm64-v8a/libjnidispatch.so
View file
Open in desktop
Binary file not shown.
Binary file removed app/libs/armeabi-v7a/libjnidispatch.so
View file
Open in desktop
Binary file not shown.
Binary file removed app/libs/x86/libjnidispatch.so
View file
Open in desktop
Binary file not shown.
Binary file removed app/libs/x86_64/libjnidispatch.so
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions app/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Sat Aug 29 01:29:45 ART 2020
AI_VERSION_CODE=100
#Fri Sep 04 01:19:24 ART 2020
AI_VERSION_CODE=260