From 8d2dcfe4bea070c2cfe659ee497cbc27b9028d63 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Tue, 21 May 2013 16:25:54 +0800
Subject: [PATCH] Android build uses linux as host. And a fix in
 generate-jsbindings.sh.

---
 tools/travis-scripts/before-install.sh      | 2 +-
 tools/travis-scripts/generate-jsbindings.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/travis-scripts/before-install.sh b/tools/travis-scripts/before-install.sh
index a503d99f87..ab1f0d99ec 100755
--- a/tools/travis-scripts/before-install.sh
+++ b/tools/travis-scripts/before-install.sh
@@ -14,7 +14,7 @@ install_android_ndk()
 {
     # Download android ndk
     echo "Download android ndk ..."
-    if [ "$PLATFORM"x = "linux"x ]; then
+    if [ "$PLATFORM"x = "android"x ]; then
         HOST_NAME="linux"
     elif [ "$PLATFORM"x = "ios"x ]; then
         HOST_NAME="darwin"
diff --git a/tools/travis-scripts/generate-jsbindings.sh b/tools/travis-scripts/generate-jsbindings.sh
index 01f322a7f7..e4d9354b6f 100755
--- a/tools/travis-scripts/generate-jsbindings.sh
+++ b/tools/travis-scripts/generate-jsbindings.sh
@@ -16,10 +16,6 @@
 #  * $NDK_ROOT
 #
 
-#Set git user
-git config --global user.email "CocosRobot@gmail.com"
-git config --global user.name ${GH_USER}
-
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 COCOS2DX_ROOT="$DIR"/../..
 TOJS_ROOT=$COCOS2DX_ROOT/tools/tojs
@@ -53,6 +49,10 @@ if [ "$GEN_JSB"x != "YES"x ]; then
     exit 0
 fi
 
+#Set git user
+git config --global user.email "CocosRobot@gmail.com"
+git config --global user.name ${GH_USER}
+
 # Update submodule of auto-gen JSBinding repo.
 pushd "$GENERATED_WORKTREE"