Browse Source

exclude normal ndk builds but use ndk paths

cdoran2011 10 years ago
parent
commit
c31333743c

+ 3 - 0
engine/compilers/android-studio/app/app.iml

@@ -86,6 +86,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
+    <content url="file://$MODULE_DIR$/../../../source">
+      <sourceFolder url="file://$MODULE_DIR$/../../../source" isTestSource="false" />
+    </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

+ 4 - 2
engine/compilers/android-studio/app/build.gradle

@@ -15,7 +15,7 @@ android {
                     'src/main/assets',
                     'src/main/game'
             ]
-            jni.srcDirs = []
+            jni.srcDirs = ['../../../source/']
             jniLibs.srcDir 'src/main/libs'
 
         }
@@ -68,6 +68,9 @@ android {
         tasks.withType(JavaCompile) {
             compileTask -> compileTask.dependsOn buildNative
         }
+        tasks.withType(com.android.build.gradle.tasks.NdkCompile){task->
+            task.enabled = false
+        }
 
     }
 
@@ -79,4 +82,3 @@ android {
     }
 
 }
-