download-toolchain-source.sh: use 'master' branch instead of 'eclair' by default.

Change-Id: Ia9bfc633d90d7d613baa286850a6ab5a4e68af30

diff --git a/build/tools/download-toolchain-sources.sh b/build/tools/download-toolchain-sources.sh
index 5d8332d..ffbc065 100755 (executable)
--- a/build/tools/download-toolchain-sources.sh
+++ b/build/tools/download-toolchain-sources.sh
@@ -31,7 +31,7 @@ OPTION_BRANCH=
 RELEASE=`date +%Y%m%d`
 
 # the default branch to use
-BRANCH=eclair
+BRANCH=master
 
 GITCMD=git
 
@@ -161,10 +161,12 @@ toolchain_clone ()
     fi
     log "checking out $BRANCH branch of $1.git"
     cd $1
-    run git checkout -b $BRANCH origin/$BRANCH
-    if [ $? != 0 ] ; then
-        echo "Could not checkout $1 ?"
-        exit 1
+    if [ "$BRANCH" != "master" ] ; then
+        run git checkout -b $BRANCH origin/$BRANCH
+        if [ $? != 0 ] ; then
+            echo "Could not checkout $1 ?"
+            exit 1
+        fi
     fi
     # get rid of .git directory, we won't need it.
     cd ..

diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT
index 3f57ef5..29819af 100644 (file)
--- a/docs/CHANGES.TXT
+++ b/docs/CHANGES.TXT
@@ -45,6 +45,9 @@ OTHER FIXES & CHANGES:
 - docs/STABLE-APIS.TXT: Add missing section for Dynamic Linker Library
   (libdl.so). It is actually supported by all API levels.
 
+- build/tools/download-toolchain-sources.sh: Use 'master' branch by default
+  instead of the 'eclair' one.
+
 -------------------------------------------------------------------------------
 android-ndk-r3