copy game assets

.gitignore

@@ -74,3 +74,4 @@ engine/compilers/android-studio/app/build/
 engine/compilers/android-studio/local.properties
 engine/compilers/android-studio/app/src/main/obj/
 engine/compilers/android-studio/app/src/main/libs/
+engine/compilers/android-studio/app/src/main/game/

engine/compilers/android-studio/app/app.iml

@@ -30,10 +30,6 @@
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../..">
-      <sourceFolder url="file://$MODULE_DIR$/../../../.." type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
@@ -57,6 +53,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/game" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />

engine/compilers/android-studio/app/build.gradle

@@ -13,7 +13,7 @@ android {
         sourceSets.main {
             assets.srcDirs=[
                     'src/main/assets',
-                    '../../../../'
+                    'src/main/game'
             ]
             jni.srcDirs = []
             jniLibs.srcDir 'src/main/libs'
@@ -35,11 +35,37 @@ android {
                     'clean'
         }
 
-        clean.dependsOn 'cleanNative'
+        task copyGame(type: Copy, description: 'Copy torque scripts and modules'){
+            from('../../../../'){
+                include '**'
+                exclude 'engine/**'
+                exclude 'tools/**'
+                exclude 'tutorials/**'
+                exclude '.**'
+                exclude '*.dll'
+                exclude 'preferences.cs'
+                exclude '*.md'
+                exclude '*.app'
+                exclude '*.bat'
+                exclude '*.log'
+                exclude '*.torsion'
+            }
+            into 'src/main/game'
+            includeEmptyDirs = false
+
+        }
 
+        task wipeGame(type: Delete, description: 'Wipe android-specific copy of torque scripts and modules'){
+            delete 'src/main/game/'
+        }
+
+        clean.dependsOn 'cleanNative'
+        clean.dependsOn 'wipeGame'
+        preBuild.dependsOn 'copyGame'
         tasks.withType(JavaCompile) {
             compileTask -> compileTask.dependsOn buildNative
         }
+
     }
 
     buildTypes {