Android build uses linux as host. And a fix in generate-jsbindings.sh.

This commit is contained in:
James Chen 2013-05-21 16:25:54 +08:00
parent 6ac72da487
commit 8d2dcfe4be
2 changed files with 5 additions and 5 deletions

View File

@ -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"

View File

@ -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"