From d56eb31aefd80963be57f54ba7741c8658db6831 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Wed, 12 Feb 2014 23:20:57 +0100
Subject: [PATCH] use pre-package jnis for gradle...

---
 settings.gradle          |  1 -
 vtm-android/build.gradle | 14 +-------------
 vtm-ext-libs             |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index e05f961b..8e79fb4c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,3 @@
-rootProject.name = 'vtm'
 include ':vtm'
 include ':vtm-android'
 include ':vtm-android-example'
diff --git a/vtm-android/build.gradle b/vtm-android/build.gradle
index b24178f3..c22dc295 100644
--- a/vtm-android/build.gradle
+++ b/vtm-android/build.gradle
@@ -2,22 +2,10 @@
 apply plugin: 'android-library'
 apply plugin: 'android-maven'
 
-//http://stackoverflow.com/questions/20674650/how-to-configure-ndk-with-android-gradle-plugin-0-7
-task nativeLibsToJar(type: Zip, description: 'create a jar with native libs') {
-	destinationDir file("$buildDir/native-libs")
-	baseName 'native-libs'
-	extension 'jar'
-	from fileTree(dir: '../vtm-ext-libs/vtm-android', include: '**/*.so')
-	into 'lib/'
-}
-
-tasks.withType(JavaCompile) {
-	compileTask -> compileTask.dependsOn nativeLibsToJar
-}
 
 dependencies {
 	compile fileTree(dir: '../vtm-ext-libs/libs', include: 'slf4j-api-1.7.5.jar')
-	compile fileTree(dir: "$buildDir/native-libs", include: '*.jar')
+	compile fileTree(dir: "../vtm-ext-libs/vtm-android", include: 'native-libs-*.jar')
 	compile project(':vtm')
 	compile 'com.android.support:support-v4:+'
 }
diff --git a/vtm-ext-libs b/vtm-ext-libs
index 0c45e578..0e592ae7 160000
--- a/vtm-ext-libs
+++ b/vtm-ext-libs
@@ -1 +1 @@
-Subproject commit 0c45e57888d16483516d8ba252cb240fa729531d
+Subproject commit 0e592ae75f17accdb13f1020ba480145d1e7c49b