mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-24 18:45:19 +00:00
Build native code for multiple architectures.
* Include native libs without requiring intermediate .jar. * Fix build warnings; use latest build tools.
This commit is contained in:
parent
977765c80f
commit
1ddc45fd9c
14
BUILDING.md
14
BUILDING.md
@ -6,3 +6,17 @@ Building TextSecure
|
|||||||
Execute Gradle:
|
Execute Gradle:
|
||||||
|
|
||||||
./gradlew build
|
./gradlew build
|
||||||
|
|
||||||
|
Re-building native components
|
||||||
|
-----------------------------
|
||||||
|
|
||||||
|
Note: This step is optional; native components are contained as binaries (see [library/libs](library/libs)).
|
||||||
|
|
||||||
|
1. Ensure that the Android NDK is installed.
|
||||||
|
|
||||||
|
Execute ndk-build:
|
||||||
|
|
||||||
|
cd library
|
||||||
|
ndk-build
|
||||||
|
|
||||||
|
Afterwards, execute Gradle as above to re-create the APK.
|
||||||
|
@ -29,7 +29,7 @@ dependencies {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 19
|
compileSdkVersion 19
|
||||||
buildToolsVersion '19.0.0'
|
buildToolsVersion '19.0.2'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 9
|
minSdkVersion 9
|
||||||
@ -42,7 +42,7 @@ android {
|
|||||||
manifest.srcFile 'AndroidManifest.xml'
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
java.srcDirs = ['src']
|
java.srcDirs = ['src']
|
||||||
resources.srcDirs = ['src']
|
resources.srcDirs = ['src']
|
||||||
aild.srcDirs = ['src']
|
aidl.srcDirs = ['src']
|
||||||
renderscript.srcDirs = ['src']
|
renderscript.srcDirs = ['src']
|
||||||
res.srcDirs = ['res']
|
res.srcDirs = ['res']
|
||||||
assets.srcDirs = ['assets']
|
assets.srcDirs = ['assets']
|
||||||
|
@ -23,12 +23,11 @@ dependencies {
|
|||||||
compile 'com.madgag:sc-light-jdk15on:1.47.0.2'
|
compile 'com.madgag:sc-light-jdk15on:1.47.0.2'
|
||||||
compile 'com.googlecode.libphonenumber:libphonenumber:5.3'
|
compile 'com.googlecode.libphonenumber:libphonenumber:5.3'
|
||||||
compile 'org.whispersystems:gson:2.2.4'
|
compile 'org.whispersystems:gson:2.2.4'
|
||||||
compile fileTree(dir: 'libs', include: 'armeabi.jar')
|
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 19
|
compileSdkVersion 19
|
||||||
buildToolsVersion '19.0.0'
|
buildToolsVersion '19.0.2'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
@ -36,10 +35,11 @@ android {
|
|||||||
manifest.srcFile 'AndroidManifest.xml'
|
manifest.srcFile 'AndroidManifest.xml'
|
||||||
java.srcDirs = ['src']
|
java.srcDirs = ['src']
|
||||||
resources.srcDirs = ['src']
|
resources.srcDirs = ['src']
|
||||||
aild.srcDirs = ['src']
|
aidl.srcDirs = ['src']
|
||||||
renderscript.srcDirs = ['src']
|
renderscript.srcDirs = ['src']
|
||||||
res.srcDirs = ['res']
|
res.srcDirs = ['res']
|
||||||
assets.srcDirs = ['assets']
|
assets.srcDirs = ['assets']
|
||||||
|
jniLibs.srcDirs = ['libs']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
1
library/jni/Application.mk
Normal file
1
library/jni/Application.mk
Normal file
@ -0,0 +1 @@
|
|||||||
|
APP_ABI := armeabi armeabi-v7a x86
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user