From fb049109803b0bb6ba2d53f741f7ee13c97fd629 Mon Sep 17 00:00:00 2001
From: iwgeric <iwgeric@gmail.com>
Date: Mon, 8 Dec 2014 22:35:23 -0500
Subject: [PATCH] Always include the jme3-android-native but only build based
 on "buildNativeProjects" property. Needed to allow for the project to package
 the pre-compiled libs if not building the project.

---
 jme3-android-native/decode.gradle     | 4 ++--
 jme3-android-native/openalsoft.gradle | 2 +-
 settings.gradle                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jme3-android-native/decode.gradle b/jme3-android-native/decode.gradle
index e3e84555a..65a92ef4f 100644
--- a/jme3-android-native/decode.gradle
+++ b/jme3-android-native/decode.gradle
@@ -40,7 +40,7 @@ task copyTremorFiles(type: Copy) {
         include '*.c'
         include '*.h'
     }
-    
+
     into outputDir
 }
 
@@ -85,7 +85,7 @@ task copyPreCompiledLibs(type: Copy) {
     into outputDir
 }
 
-if (rootProject.ndkExists) {
+if (rootProject.ndkExists && rootProject.buildNativeProjects) {
     // build native libs and update stored pre-compiled libs to commit
     compileJava.dependsOn { updatePreCompiledLibs }
 } else {
diff --git a/jme3-android-native/openalsoft.gradle b/jme3-android-native/openalsoft.gradle
index 133a1729e..a7dd2e005 100644
--- a/jme3-android-native/openalsoft.gradle
+++ b/jme3-android-native/openalsoft.gradle
@@ -111,7 +111,7 @@ task copyPreCompiledOpenAlSoftLibs(type: Copy) {
     into outputDir
 }
 
-if (rootProject.ndkExists) {
+if (rootProject.ndkExists && rootProject.buildNativeProjects) {
     // build native libs and update stored pre-compiled libs to commit
     compileJava.dependsOn { updatePreCompiledOpenAlSoftLibs }
 } else {
diff --git a/settings.gradle b/settings.gradle
index 4edc5db6d..28fe6af29 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,10 +26,10 @@ include 'jme3-ios'
 //native builds
 include 'jme3-bullet' //java
 if(buildNativeProjects == "true"){
-    include 'jme3-android-native' //cpp
     include 'jme3-bullet-native' //cpp
     include 'jme3-bullet-native-android' //cpp
 }
+include 'jme3-android-native' //cpp
 
 // Test Data project
 include 'jme3-testdata'