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:
Florian Walch 2014-02-25 09:35:55 +01:00 committed by Moxie Marlinspike
parent 977765c80f
commit 1ddc45fd9c
5 changed files with 20 additions and 5 deletions

View File

@ -6,3 +6,17 @@ Building TextSecure
Execute Gradle:
./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.

View File

@ -29,7 +29,7 @@ dependencies {
android {
compileSdkVersion 19
buildToolsVersion '19.0.0'
buildToolsVersion '19.0.2'
defaultConfig {
minSdkVersion 9
@ -42,7 +42,7 @@ android {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aild.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']

View File

@ -23,12 +23,11 @@ dependencies {
compile 'com.madgag:sc-light-jdk15on:1.47.0.2'
compile 'com.googlecode.libphonenumber:libphonenumber:5.3'
compile 'org.whispersystems:gson:2.2.4'
compile fileTree(dir: 'libs', include: 'armeabi.jar')
}
android {
compileSdkVersion 19
buildToolsVersion '19.0.0'
buildToolsVersion '19.0.2'
android {
sourceSets {
@ -36,10 +35,11 @@ android {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aild.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
jniLibs.srcDirs = ['libs']
}
}
}

View File

@ -0,0 +1 @@
APP_ABI := armeabi armeabi-v7a x86

Binary file not shown.