From 2ca1305ff550a0a20e3595269db0147fe218c064 Mon Sep 17 00:00:00 2001
From: shadowislord <shadowislord@gmail.com>
Date: Tue, 25 Nov 2014 18:49:22 -0500
Subject: [PATCH] Fix bullet native android build on latest NDK

---
 jme3-bullet-native-android/build.gradle | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/jme3-bullet-native-android/build.gradle b/jme3-bullet-native-android/build.gradle
index 982f4c34e..ebacea74b 100644
--- a/jme3-bullet-native-android/build.gradle
+++ b/jme3-bullet-native-android/build.gradle
@@ -141,27 +141,27 @@ task generateNativeHeaders(dependsOn: copyJmeAndroid) << {
             com.jme3.bullet.joints.motors.TranslationalLimitMotor, \
             \
             com.jme3.bullet.util.NativeMeshUtil, \
-            com.jme3.bullet.util.DebugShapeFactory, \
-            "
+            com.jme3.bullet.util.DebugShapeFactory"
 
     String projectClassPath = configurations.runtime.asFileTree.matching {
         exclude ".gradle"
     }.asPath
 
-    ant.javah(
-        classpath: projectClassPath,
-        destdir: destDirPath,
-        class: classes
-    )
-
+    exec {
+        executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah')
+        args '-d', destDirPath
+        args '-classpath', projectClassPath
+        args classes.split(",").collect { it.trim() }
+    }
 }
 
 task buildBulletNativeLib(type: Exec, dependsOn: generateNativeHeaders) {
-    args 'TARGET_PLATFORM=android-9'
+//    args 'TARGET_PLATFORM=android-9'
 //    println "buildBulletNativeLib ndkWorkingPath: " + ndkWorkingPath
 //    println "buildBulletNativeLib rootProject.ndkCommandPath: " + rootProject.ndkCommandPath
     workingDir ndkWorkingPath
     executable rootProject.ndkCommandPath
+    args "-j8"
 }
 
 //task updatePreCompiledBulletLibs(type: Copy, dependsOn: generateNativeHeaders) {