[Android] gradle copy resources to assets folder before preDebug|ReleaseBuild

templates/cpp-template-default/proj.android/app/build.gradle

@@ -111,19 +111,22 @@ android {
 }
 
 android.applicationVariants.all { variant ->
-    def project_root_folder = "${buildDir}/../../.."
-    def dest_assets_folder = "${buildDir}/../assets"
+    def project_root_folder = "${projectDir}/../.."
+    def dest_assets_folder = "${projectDir}/assets"
 
     // delete previous files first
     delete dest_assets_folder
-
-    variant.mergeAssets.doFirst {
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+
+    tasks.register(copyTaskName) {
         copy {
             from project_root_folder + "/Resources"
             into dest_assets_folder
             exclude "**/*.gz"
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle

@@ -114,11 +114,19 @@ def getCocosCommandPath() {
         return 'cocos.bat'
     }
     else {
+
+        def env_console_path = System.getenv("COCOS_CONSOLE_ROOT")
+
+        if (env_console_path != null && !env_console_path.trim().isEmpty()) {
+            return new File(env_console_path.trim() + '/cocos').absolutePath
+        }
+
         // on unix like system, can not get environments variables easily
         // so run a shell script to get environment variable sets by cocos2d-x setup.py
         new ByteArrayOutputStream().withStream { os ->
             def result = exec {
-                executable = project.file('get_environment.sh')
+                executable = "/bin/bash"
+                args = [ "-i", project.file('get_environment.sh')]
                 standardOutput = os
             }
             ext.console_path = os.toString().trim()
@@ -146,13 +154,15 @@ def compileJS(srcDir, dstDir) {
 }
 
 android.applicationVariants.all { variant ->
-    def project_root_folder = "${buildDir}/../../../../.."
-    def dest_assets_folder = "${buildDir}/../assets"
+    def project_root_folder = "${projectDir}/../../../.."
+    def dest_assets_folder = "${projectDir}/assets"
 
     // delete previous files first
     delete dest_assets_folder
-
-    variant.mergeAssets.doFirst {
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+
+    tasks.register(copyTaskName) {
         copy {
            from project_root_folder + "/res"
            into dest_assets_folder + "/res"
@@ -184,6 +194,7 @@ android.applicationVariants.all { variant ->
             compileJS(dest_assets_folder, dest_assets_folder)
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
 
-source ~/.bash_profile
-echo $COCOS_CONSOLE_ROOT
+if [ -f $HOME/.bashrc ]; then
+    source $HOME/.bashrc
+fi
+
+if [ -f $HOME/.bash_profile ]; then
+    source $HOME/.bash_profile
+fi
+
+echo $COCOS_CONSOLE_ROOT

templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle

@@ -115,11 +115,19 @@ def getCocosCommandPath() {
         return 'cocos.bat'
     }
     else {
+
+        def env_console_path = System.getenv("COCOS_CONSOLE_ROOT")
+
+        if (env_console_path != null && !env_console_path.trim().isEmpty()) {
+            return new File(env_console_path.trim() + '/cocos').absolutePath
+        }
+
         // on unix like system, can not get environments variables easily
         // so run a shell script to get environment variable sets by cocos2d-x setup.py
         new ByteArrayOutputStream().withStream { os ->
             def result = exec {
-                executable = project.file('get_environment.sh')
+                executable = "/bin/bash"
+                args = [ "-i", project.file('get_environment.sh')]
                 standardOutput = os
             }
             ext.console_path = os.toString().trim()
@@ -161,13 +169,16 @@ def compileLua(srcDir, dstDir, doCompile, is64bit, doEncrypt) {
 }
 
 android.applicationVariants.all { variant ->
-    def project_root_folder = "${buildDir}/../../../../.."
-    def dest_assets_folder = "${buildDir}/../assets"
+    def project_root_folder = "${projectDir}/../../../.."
+    def dest_assets_folder = "${projectDir}/assets"
 
     // delete previous files first
     delete dest_assets_folder
 
-    variant.mergeAssets.doFirst {
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+
+    tasks.register(copyTaskName) {
         copy {
            from project_root_folder + "/res"
            into dest_assets_folder + "/res"
@@ -179,7 +190,7 @@ android.applicationVariants.all { variant ->
         }
 
         // copy {
-        //     from "${buildDir}/../../../../cocos2d-x/cocos/scripting/lua-bindings/script"
+        //     from "${projectDir}/../../../cocos2d-x/cocos/scripting/lua-bindings/script"
         //     into  dest_assets_folder + "/src/cocos"
         // }
 
@@ -255,6 +266,7 @@ android.applicationVariants.all { variant ->
             }
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
 
-source ~/.bash_profile
-echo $COCOS_CONSOLE_ROOT
+if [ -f $HOME/.bashrc ]; then
+    source $HOME/.bashrc
+fi
+
+if [ -f $HOME/.bash_profile ]; then
+    source $HOME/.bash_profile
+fi
+
+echo $COCOS_CONSOLE_ROOT

tests/cpp-empty-test/proj.android/app/build.gradle

@@ -51,7 +51,7 @@ android {
         java.srcDir "src"
         res.srcDir "res"
         manifest.srcFile "AndroidManifest.xml"
-        assets.srcDir "../../Resources"
+        assets.srcDir "assets"
     }
 
     externalNativeBuild {
@@ -112,16 +112,19 @@ android {
 }
 
 android.applicationVariants.all { variant ->
-    // delete previous files first
-    delete "${buildDir}/intermediates/assets/${variant.dirName}"
 
-    variant.mergeAssets.doLast {
+    delete "${projectDir}/assets"
+
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+    tasks.register(copyTaskName) {
         copy {
-            from "${buildDir}/../../../Resources"
-            into "${buildDir}/intermediates/assets/${variant.dirName}"
+            from "${projectDir}/../../Resources"
+            into "${projectDir}/assets"
             exclude "**/*.gz"
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

tests/cpp-tests/proj.android/app/build.gradle

@@ -50,6 +50,7 @@ android {
         java.srcDir "src"
         res.srcDir "res"
         manifest.srcFile "AndroidManifest.xml"
+        assets.srcDir "assets"
     }
 
     externalNativeBuild {
@@ -110,16 +111,18 @@ android {
 }
 
 android.applicationVariants.all { variant ->
-    // delete previous files first
-    delete "${buildDir}/intermediates/assets/${variant.dirName}"
 
-    variant.mergeAssets.doLast {
+    delete "${projectDir}/assets"
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+    tasks.register(copyTaskName) {
         copy {
-           from "${buildDir}/../../../Resources"
-           into "${buildDir}/intermediates/assets/${variant.dirName}"
-           exclude "**/*.gz"
+            from "${projectDir}/../../Resources"
+            into "${projectDir}/assets"
+            exclude "**/*.gz"
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

tests/game-controller-test/proj.android/app/build.gradle

@@ -26,6 +26,7 @@ android {
         java.srcDir "src"
         res.srcDir "res"
         manifest.srcFile "AndroidManifest.xml"
+        assets.srcDir "assets"
     }
 
     externalNativeBuild {
@@ -81,16 +82,18 @@ buildTypes {
 }
 
 android.applicationVariants.all { variant ->
-    // delete previous files first
-    delete "${buildDir}/intermediates/assets/${variant.dirName}"
 
-    variant.mergeAssets.doLast {
+    delete "${projectDir}/assets"
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+    tasks.register(copyTaskName) {
         copy {
-            from "${buildDir}/../../../Resources"
-            into "${buildDir}/intermediates/assets/${variant.dirName}"
+            from "${projectDir}/../../Resources"
+            into "${projectDir}/assets"
             exclude "**/*.gz"
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

tests/js-tests/project/proj.android/app/build.gradle

@@ -50,6 +50,7 @@ android {
         java.srcDir "src"
         res.srcDir "res"
         manifest.srcFile "AndroidManifest.xml"
+        assets.srcDir "assets"
     }
 
     externalNativeBuild {
@@ -114,11 +115,19 @@ def getCocosCommandPath() {
         return 'cocos.bat'
     }
     else {
+
+        def env_console_path = System.getenv("COCOS_CONSOLE_ROOT")
+
+        if (env_console_path != null && !env_console_path.trim().isEmpty()) {
+            return new File(env_console_path.trim() + '/cocos').absolutePath
+        }
+
         // on unix like system, can not get environments variables easily
         // so run a shell script to get environment variable sets by cocos2d-x setup.py
         new ByteArrayOutputStream().withStream { os ->
             def result = exec {
-                executable = project.file('get_environment.sh')
+                executable = "/bin/bash"
+                args = [ "-i", project.file('get_environment.sh')]
                 standardOutput = os
             }
             ext.console_path = os.toString().trim()
@@ -145,41 +154,43 @@ def compileJS(srcDir, dstDir) {
 }
 
 android.applicationVariants.all { variant ->
-    // delete previous files first
-    delete "${buildDir}/intermediates/assets/${variant.dirName}"
-
-    variant.mergeAssets.doLast {
+
+    delete "${projectDir}/assets"
+    def targetName = variant.name.capitalize()
+    def copyTaskName = "copy${targetName}ResourcesToAssets"
+
+    tasks.register(copyTaskName) {
         copy {
-           from "${buildDir}/../../../../res"
-           into "${buildDir}/intermediates/assets/${variant.dirName}/res"
+           from "${projectDir}/../../../res"
+           into "${projectDir}/assets/res"
         }
 
         copy {
-            from "${buildDir}/../../../../resjs"
-            into "${buildDir}/intermediates/assets/${variant.dirName}/res/resjs"
+            from "${projectDir}/../../../resjs"
+            into "${projectDir}/assets/res/resjs"
         }
 
         copy {
-            from "${buildDir}/../../../../src"
-            into "${buildDir}/intermediates/assets/${variant.dirName}/src"
+            from "${projectDir}/../../../src"
+            into "${projectDir}/assets/src"
         }
 
         copy {
-            from("${buildDir}/../../../../../cpp-tests/Resources") {
+            from("${projectDir}/../../../../cpp-tests/Resources") {
                 exclude "**/*.gz"
             }
-            into "${buildDir}/intermediates/assets/${variant.dirName}/res"
+            into "${projectDir}/assets/res"
         }
 
         copy {
-            from "${buildDir}/../../../../../../cocos/scripting/js-bindings/script"
-            into  "${buildDir}/intermediates/assets/${variant.dirName}/script"
+            from "${projectDir}/../../../../../cocos/scripting/js-bindings/script"
+            into  "${projectDir}/assets/script"
         }
 
         copy {
-            from "${buildDir}/../../../../main.js"
-            from "${buildDir}/../../../../project.json"
-            into "${buildDir}/intermediates/assets/${variant.dirName}"
+            from "${projectDir}/../../../main.js"
+            from "${projectDir}/../../../project.json"
+            into "${projectDir}/assets"
         }
 
         // compile the scripts if necessary
@@ -189,10 +200,11 @@ android.applicationVariants.all { variant ->
         }
 
         if (compileScript) {
-            compileJS("${buildDir}/intermediates/assets/${variant.dirName}",
-                      "${buildDir}/intermediates/assets/${variant.dirName}")
+            compileJS("${projectDir}/assets",
+                      "${projectDir}/assets")
         }
     }
+    tasks.getByName("pre${targetName}Build").dependsOn copyTaskName
 }
 
 dependencies {

tests/js-tests/project/proj.android/app/get_environment.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
 
-source ~/.bash_profile
-echo $COCOS_CONSOLE_ROOT
+if [ -f $HOME/.bashrc ]; then
+    source $HOME/.bashrc
+fi
+
+if [ -f $HOME/.bash_profile ]; then
+    source $HOME/.bash_profile
+fi
+
+echo $COCOS_CONSOLE_ROOT