Merge change 5640 into donut

* changes:
  Bump release version number and speed up make-release.sh script

ndk/build/tools/make-release.sh

@@ -9,7 +9,7 @@ NDK_ROOT_DIR=`dirname $0`/../..
 NDK_ROOT_DIR=`cd $NDK_ROOT_DIR && pwd`
 
 # the release name
-RELEASE=1.5_r1
+RELEASE=1.5_r2
 
 # the package prefix
 PREFIX=android-ndk
@@ -23,7 +23,6 @@ PREBUILT_PREFIX=android-ndk-prebuilt-20090323
 # the list of supported host development systems
 PREBUILT_SYSTEMS="linux-x86 darwin-x86 windows"
 
-
 OPTION_HELP=no
 
 for opt do
@@ -105,7 +104,7 @@ for SYS in $PREBUILT_SYSTEMS; do
     fi
 done
 
-# the list of git files to copy into the archives
+# The list of git files to copy into the archives
 GIT_FILES=`cd $NDK_ROOT_DIR && git ls-files`
 
 # temporary directory used for packaging
@@ -119,9 +118,7 @@ rm -rf $TMPDIR && mkdir -p $TMPDIR
 echo "Creating reference from git files"
 REFERENCE=$TMPDIR/reference &&
 mkdir -p $REFERENCE &&
-(for ff in $GIT_FILES; do
-  mkdir -p $REFERENCE/`dirname $ff` && cp -pf $NDK_ROOT_DIR/$ff $REFERENCE/$ff;
-done) &&
+(cd $NDK_ROOT_DIR && tar cf - $GIT_FILES) | (cd $REFERENCE && tar xf -) &&
 rm -f $REFERENCE/Android.mk
 if [ $? != 0 ] ; then
     echo "Could not create git reference. Aborting."
@@ -165,4 +162,3 @@ rm -rf $TMPDIR/reference
 
 echo "Done, please see packages in $TMPDIR:"
 ls -l $TMPDIR
-