diff --git a/vtm-android-example/build.gradle b/vtm-android-example/build.gradle index 95936e38..0a0559f0 100644 --- a/vtm-android-example/build.gradle +++ b/vtm-android-example/build.gradle @@ -31,7 +31,9 @@ android { resources.srcDirs = ['src', 'assets'] res.srcDirs = ['res'] 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') release.setRoot('build-types/release') diff --git a/vtm-android-gdx/build.gradle b/vtm-android-gdx/build.gradle index 2b14331e..83c4a857 100644 --- a/vtm-android-gdx/build.gradle +++ b/vtm-android-gdx/build.gradle @@ -32,7 +32,10 @@ android { renderscript.srcDirs = ['src', 'assets'] res.srcDirs = ['res'] 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') release.setRoot('build-types/release') @@ -53,18 +56,22 @@ android.applicationVariants.all { variant -> taskJar.from variant.javaCompile.destinationDir artifacts.add('archives', taskJar); - def taskNatives = project.tasks.create "nativesJar${name.capitalize()}", Jar - taskNatives.classifier = 'natives' - taskNatives.from('natives') - artifacts.add('archives', taskNatives); + file('natives').eachDir() { dir -> + def taskNatives = project.tasks.create "natives_${dir.name}_Jar${name.capitalize()}", Jar + taskNatives.classifier = "natives-${dir.name}" + taskNatives.from(dir.path) + artifacts.add('archives', taskNatives); + } def taskFat = project.tasks.create "fatJar${name.capitalize()}", Jar taskFat.classifier = 'jar-with-dependencies' taskFat.dependsOn variant.javaCompile taskFat.from variant.javaCompile.destinationDir taskFat.from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } } - taskFat.from('natives') - taskFat.from("${rootProject.projectDir}/vtm-android/natives") + file('natives').eachDir() { dir -> + taskFat.from(dir.path) + taskFat.from("${rootProject.projectDir}/vtm-android/natives/${dir.name}") + } artifacts.add('archives', taskFat); } diff --git a/vtm-android-gdx/natives/arm64-v8a/lib/arm64-v8a/libgdx.so b/vtm-android-gdx/natives/arm64-v8a/lib/arm64-v8a/libgdx.so new file mode 100644 index 00000000..211f16cd Binary files /dev/null and b/vtm-android-gdx/natives/arm64-v8a/lib/arm64-v8a/libgdx.so differ diff --git a/vtm-android-gdx/natives/lib/armeabi-v7a/libgdx.so b/vtm-android-gdx/natives/armeabi-v7a/lib/armeabi-v7a/libgdx.so similarity index 100% rename from vtm-android-gdx/natives/lib/armeabi-v7a/libgdx.so rename to vtm-android-gdx/natives/armeabi-v7a/lib/armeabi-v7a/libgdx.so diff --git a/vtm-android-gdx/natives/lib/armeabi/libgdx.so b/vtm-android-gdx/natives/armeabi/lib/armeabi/libgdx.so similarity index 100% rename from vtm-android-gdx/natives/lib/armeabi/libgdx.so rename to vtm-android-gdx/natives/armeabi/lib/armeabi/libgdx.so diff --git a/vtm-android-gdx/natives/lib/x86/libgdx.so b/vtm-android-gdx/natives/x86/lib/x86/libgdx.so similarity index 100% rename from vtm-android-gdx/natives/lib/x86/libgdx.so rename to vtm-android-gdx/natives/x86/lib/x86/libgdx.so diff --git a/vtm-android-gdx/natives/x86_64/lib/x86_64/libgdx.so b/vtm-android-gdx/natives/x86_64/lib/x86_64/libgdx.so new file mode 100644 index 00000000..a4890bcc Binary files /dev/null and b/vtm-android-gdx/natives/x86_64/lib/x86_64/libgdx.so differ diff --git a/vtm-android-start/build.gradle b/vtm-android-start/build.gradle index ac005775..254db71d 100644 --- a/vtm-android-start/build.gradle +++ b/vtm-android-start/build.gradle @@ -28,7 +28,9 @@ android { resources.srcDirs = ['src', 'assets'] res.srcDirs = ['res'] 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') release.setRoot('build-types/release') diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle index 7620fe14..599eae5f 100644 --- a/vtm-android/build.gradle +++ b/vtm-android/build.gradle @@ -48,17 +48,21 @@ android.libraryVariants.all { variant -> taskJar.from variant.javaCompile.destinationDir artifacts.add('archives', taskJar); - def taskNatives = project.tasks.create "nativesJar${name.capitalize()}", Jar - taskNatives.classifier = 'natives' - taskNatives.from('natives') - artifacts.add('archives', taskNatives); + file('natives').eachDir() { dir -> + def taskNatives = project.tasks.create "natives_${dir.name}_Jar${name.capitalize()}", Jar + taskNatives.classifier = "natives-${dir.name}" + taskNatives.from(dir.path) + artifacts.add('archives', taskNatives); + } def taskFat = project.tasks.create "fatJar${name.capitalize()}", Jar taskFat.classifier = 'jar-with-dependencies' taskFat.dependsOn variant.javaCompile taskFat.from variant.javaCompile.destinationDir 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); } diff --git a/vtm-android/natives/arm64-v8a/lib/arm64-v8a/libvtm-jni.so b/vtm-android/natives/arm64-v8a/lib/arm64-v8a/libvtm-jni.so new file mode 100755 index 00000000..cfd29934 Binary files /dev/null and b/vtm-android/natives/arm64-v8a/lib/arm64-v8a/libvtm-jni.so differ diff --git a/vtm-android/natives/lib/armeabi-v7a/libvtm-jni.so b/vtm-android/natives/armeabi-v7a/lib/armeabi-v7a/libvtm-jni.so similarity index 100% rename from vtm-android/natives/lib/armeabi-v7a/libvtm-jni.so rename to vtm-android/natives/armeabi-v7a/lib/armeabi-v7a/libvtm-jni.so diff --git a/vtm-android/natives/lib/armeabi/libvtm-jni.so b/vtm-android/natives/armeabi/lib/armeabi/libvtm-jni.so similarity index 100% rename from vtm-android/natives/lib/armeabi/libvtm-jni.so rename to vtm-android/natives/armeabi/lib/armeabi/libvtm-jni.so diff --git a/vtm-android/natives/mips/lib/mips/libvtm-jni.so b/vtm-android/natives/mips/lib/mips/libvtm-jni.so new file mode 100755 index 00000000..a6c4e5aa Binary files /dev/null and b/vtm-android/natives/mips/lib/mips/libvtm-jni.so differ diff --git a/vtm-android/natives/mips64/lib/mips64/libvtm-jni.so b/vtm-android/natives/mips64/lib/mips64/libvtm-jni.so new file mode 100755 index 00000000..4b61fd82 Binary files /dev/null and b/vtm-android/natives/mips64/lib/mips64/libvtm-jni.so differ diff --git a/vtm-android/natives/lib/x86/libvtm-jni.so b/vtm-android/natives/x86/lib/x86/libvtm-jni.so similarity index 100% rename from vtm-android/natives/lib/x86/libvtm-jni.so rename to vtm-android/natives/x86/lib/x86/libvtm-jni.so diff --git a/vtm-android/natives/x86_64/lib/x86_64/libvtm-jni.so b/vtm-android/natives/x86_64/lib/x86_64/libvtm-jni.so new file mode 100755 index 00000000..24cd645b Binary files /dev/null and b/vtm-android/natives/x86_64/lib/x86_64/libvtm-jni.so differ