Android native libraries complete collection, closes #85

This commit is contained in:
Emux 2016-07-20 21:46:39 +03:00
parent 243aca9ae9
commit 8a2afd7b40
16 changed files with 29 additions and 14 deletions

View File

@ -31,7 +31,9 @@ android {
resources.srcDirs = ['src', 'assets'] resources.srcDirs = ['src', 'assets']
res.srcDirs = ['res'] res.srcDirs = ['res']
assets.srcDirs = ['assets'] assets.srcDirs = ['assets']
jniLibs.srcDirs = ["${rootDir}/vtm-android/natives/lib"] file("${rootDir}/vtm-android/natives").eachDir() { dir ->
jniLibs.srcDirs += "${dir.path}/lib"
}
} }
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')

View File

@ -32,7 +32,10 @@ android {
renderscript.srcDirs = ['src', 'assets'] renderscript.srcDirs = ['src', 'assets']
res.srcDirs = ['res'] res.srcDirs = ['res']
assets.srcDirs = ['assets'] assets.srcDirs = ['assets']
jniLibs.srcDirs = ['natives/lib', "${rootDir}/vtm-android/natives/lib"] file('natives').eachDir() { dir ->
jniLibs.srcDirs += "${dir.path}/lib"
jniLibs.srcDirs += "${rootDir}/vtm-android/natives/${dir.name}/lib"
}
} }
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')
@ -53,18 +56,22 @@ android.applicationVariants.all { variant ->
taskJar.from variant.javaCompile.destinationDir taskJar.from variant.javaCompile.destinationDir
artifacts.add('archives', taskJar); artifacts.add('archives', taskJar);
def taskNatives = project.tasks.create "nativesJar${name.capitalize()}", Jar file('natives').eachDir() { dir ->
taskNatives.classifier = 'natives' def taskNatives = project.tasks.create "natives_${dir.name}_Jar${name.capitalize()}", Jar
taskNatives.from('natives') taskNatives.classifier = "natives-${dir.name}"
artifacts.add('archives', taskNatives); taskNatives.from(dir.path)
artifacts.add('archives', taskNatives);
}
def taskFat = project.tasks.create "fatJar${name.capitalize()}", Jar def taskFat = project.tasks.create "fatJar${name.capitalize()}", Jar
taskFat.classifier = 'jar-with-dependencies' taskFat.classifier = 'jar-with-dependencies'
taskFat.dependsOn variant.javaCompile taskFat.dependsOn variant.javaCompile
taskFat.from variant.javaCompile.destinationDir taskFat.from variant.javaCompile.destinationDir
taskFat.from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } taskFat.from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
taskFat.from('natives') file('natives').eachDir() { dir ->
taskFat.from("${rootProject.projectDir}/vtm-android/natives") taskFat.from(dir.path)
taskFat.from("${rootProject.projectDir}/vtm-android/natives/${dir.name}")
}
artifacts.add('archives', taskFat); artifacts.add('archives', taskFat);
} }

Binary file not shown.

View File

@ -28,7 +28,9 @@ android {
resources.srcDirs = ['src', 'assets'] resources.srcDirs = ['src', 'assets']
res.srcDirs = ['res'] res.srcDirs = ['res']
assets.srcDirs = ['assets'] assets.srcDirs = ['assets']
jniLibs.srcDirs = ["${rootDir}/vtm-android/natives/lib"] file("${rootDir}/vtm-android/natives").eachDir() { dir ->
jniLibs.srcDirs += "${dir.path}/lib"
}
} }
debug.setRoot('build-types/debug') debug.setRoot('build-types/debug')
release.setRoot('build-types/release') release.setRoot('build-types/release')

View File

@ -48,17 +48,21 @@ android.libraryVariants.all { variant ->
taskJar.from variant.javaCompile.destinationDir taskJar.from variant.javaCompile.destinationDir
artifacts.add('archives', taskJar); artifacts.add('archives', taskJar);
def taskNatives = project.tasks.create "nativesJar${name.capitalize()}", Jar file('natives').eachDir() { dir ->
taskNatives.classifier = 'natives' def taskNatives = project.tasks.create "natives_${dir.name}_Jar${name.capitalize()}", Jar
taskNatives.from('natives') taskNatives.classifier = "natives-${dir.name}"
artifacts.add('archives', taskNatives); taskNatives.from(dir.path)
artifacts.add('archives', taskNatives);
}
def taskFat = project.tasks.create "fatJar${name.capitalize()}", Jar def taskFat = project.tasks.create "fatJar${name.capitalize()}", Jar
taskFat.classifier = 'jar-with-dependencies' taskFat.classifier = 'jar-with-dependencies'
taskFat.dependsOn variant.javaCompile taskFat.dependsOn variant.javaCompile
taskFat.from variant.javaCompile.destinationDir taskFat.from variant.javaCompile.destinationDir
taskFat.from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } taskFat.from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
taskFat.from('natives') file('natives').eachDir() { dir ->
taskFat.from(dir.path)
}
artifacts.add('archives', taskFat); artifacts.add('archives', taskFat);
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.