diff --git a/.gitignore b/.gitignore
index 8ab2dcda3246..31b95ac76e50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -182,3 +182,4 @@ temp/
 
 # external libs zip
 *.zip
+**/simulator/
\ No newline at end of file
diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh b/templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh
index 102f7247e70a..61ce03524ccb 100755
--- a/templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh
+++ b/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
\ No newline at end of file
+if [ -f $HOME/.bashrc ]; then
+    source $HOME/.bashrc
+fi
+
+if [ -f $HOME/.bash_profile ]; then
+    source $HOME/.bash_profile
+fi
+
+echo $COCOS_CONSOLE_ROOT
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh
index 102f7247e70a..61ce03524ccb 100755
--- a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh
+++ b/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
\ No newline at end of file
+if [ -f $HOME/.bashrc ]; then
+    source $HOME/.bashrc
+fi
+
+if [ -f $HOME/.bash_profile ]; then
+    source $HOME/.bash_profile
+fi
+
+echo $COCOS_CONSOLE_ROOT
diff --git a/tests/js-tests/project/proj.android/app/get_environment.sh b/tests/js-tests/project/proj.android/app/get_environment.sh
index 102f7247e70a..61ce03524ccb 100755
--- a/tests/js-tests/project/proj.android/app/get_environment.sh
+++ b/tests/js-tests/project/proj.android/app/get_environment.sh
@@ -1,4 +1,11 @@
 #!/bin/bash
 
-source ~/.bash_profile
-echo $COCOS_CONSOLE_ROOT
\ No newline at end of file
+if [ -f $HOME/.bashrc ]; then
+    source $HOME/.bashrc
+fi
+
+if [ -f $HOME/.bash_profile ]; then
+    source $HOME/.bash_profile
+fi
+
+echo $COCOS_CONSOLE_ROOT
diff --git a/tests/lua-empty-test/project/proj.android/app/build.gradle b/tests/lua-empty-test/project/proj.android/app/build.gradle
index 0c04b6c252ff..002a1af553b9 100644
--- a/tests/lua-empty-test/project/proj.android/app/build.gradle
+++ b/tests/lua-empty-test/project/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()
diff --git a/tests/lua-empty-test/project/proj.android/app/get_environment.sh b/tests/lua-empty-test/project/proj.android/app/get_environment.sh
index 102f7247e70a..61ce03524ccb 100755
--- a/tests/lua-empty-test/project/proj.android/app/get_environment.sh
+++ b/tests/lua-empty-test/project/proj.android/app/get_environment.sh
@@ -1,4 +1,11 @@
 #!/bin/bash
 
-source ~/.bash_profile
-echo $COCOS_CONSOLE_ROOT
\ No newline at end of file
+if [ -f $HOME/.bashrc ]; then
+    source $HOME/.bashrc
+fi
+
+if [ -f $HOME/.bash_profile ]; then
+    source $HOME/.bash_profile
+fi
+
+echo $COCOS_CONSOLE_ROOT
diff --git a/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties b/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties
index ab7338f669d1..ea5c40f809ea 100644
--- a/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties
+++ b/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 14 17:47:54 CST 2017
+#Fri May 10 15:15:29 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/tools/cocos2d-console b/tools/cocos2d-console
index 643f423415c6..2eb407382b0b 160000
--- a/tools/cocos2d-console
+++ b/tools/cocos2d-console
@@ -1 +1 @@
-Subproject commit 643f423415c62a1b610549323c4bf5499683baab
+Subproject commit 2eb407382b0bb42096e30a8a3759e5ae9fe2072f