From 13f50b207276c02114e69d3e705059dadff810e8 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Tue, 21 May 2013 17:29:23 +0800
Subject: [PATCH] [Travis CI] Using linux by default. [ci skip]

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

diff --git a/tools/travis-scripts/before-install.sh b/tools/travis-scripts/before-install.sh
index 4f0b065556..8e07bdd2da 100755
--- a/tools/travis-scripts/before-install.sh
+++ b/tools/travis-scripts/before-install.sh
@@ -13,10 +13,10 @@ pushd $HOME/bin
 install_android_ndk()
 {
     # Download android ndk
-    if [ "$PLATFORM"x = "android"x ]; then
-        HOST_NAME="linux"
-    elif [ "$PLATFORM"x = "ios"x ]; then
+    if [ "$PLATFORM"x = "ios"x ]; then
         HOST_NAME="darwin"
+    else
+        HOST_NAME="linux"
     fi
     echo "Download android-ndk-r8e-${HOST_NAME}-x86_64.tar.bz2 ..."
     curl -O http://dl.google.com/android/ndk/android-ndk-r8e-${HOST_NAME}-x86_64.tar.bz2
@@ -28,10 +28,10 @@ install_android_ndk()
 
 install_llvm()
 {
-    if [ "$PLATFORM"x = "android"x ]; then
-        HOST_NAME="linux-ubuntu_12.04"
-    elif [ "$PLATFORM"x = "ios"x ]; then
+    if [ "$PLATFORM"x = "ios"x ]; then
         HOST_NAME="apple-darwin11"
+    else
+        HOST_NAME="linux-ubuntu_12.04"
     fi
     # Download llvm3.1
     echo "Download clang+llvm-3.1-x86_64-${HOST_NAME}.tar.gz"
diff --git a/tools/travis-scripts/generate-jsbindings.sh b/tools/travis-scripts/generate-jsbindings.sh
index 86804ae8d8..e8f0fda2d1 100755
--- a/tools/travis-scripts/generate-jsbindings.sh
+++ b/tools/travis-scripts/generate-jsbindings.sh
@@ -38,7 +38,7 @@ if [ "$PLATFORM"x = "ios"x ]; then
     cd Cheetah-2.4.4
     sudo python setup.py install 2> /dev/null > /dev/null
     popd
-elif [ "$PLATFORM"x = "android"x ]; then
+else
     sudo apt-get --force-yes --yes install python-yaml python-cheetah
 fi