2 activités séparés pour les paramètres (config+param)

+ jniLibs replaced by original libs generated by tesseract
+ home page update: new Background !, updated texviews and co
This commit is contained in:
Vincent KHERBACHE
2015-02-02 00:55:56 +01:00
parent 3e0bb63481
commit bbfd08690e
17 changed files with 155 additions and 222 deletions

View File

@@ -12,8 +12,13 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
//// This prevents the auto generation of Android.mk
// This prevents the auto generation of Android.mk
sourceSets.main.jni.srcDirs = []
// Manually specify jniLibs directory (this prevents copying libs files to app dir)
sourceSets.main.jniLibs.srcDir 'src/main/libs'
task buildNative(type: Exec, description: 'Compile JNI source via NDK') {
def ndkDir = android.plugin.ndkFolder
commandLine "$ndkDir/ndk-build",
@@ -28,14 +33,18 @@ android {
'-C', file('src/main/jni').absolutePath,
'clean'
}
clean.dependsOn 'cleanNative'
tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn buildNative
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
productFlavors {
}
}