LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 1651 into donut

Browse Source 
* changes:
  Fix the build-toolchain.sh script which doesn't work due to the new download location of the NDK sources and a small typo when using wget. Also make --force-download actually work.
This commit is contained in:
Android (Google) Code Review
2009-05-14 14:51:09 -07:00
parent dda76aac46 498455c79f
commit 79b3c18a27
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ndk/build/toolchains/archive/toolchain/sources.txt
View File

@@ -1,3 +1,3 @@
android-toolchain-20090323.tar.bz2 android-ndk-toolchain-20090323.tar.bz2
d56abac4df36271ae0c961d21d0847db d56abac4df36271ae0c961d21d0847db
http://android.git.kernel.org/pub/android-toolchain-20090323.tar.bz2 http://android.git.kernel.org/pub/android-ndk-toolchain-20090323.tar.bz2

18
ndk/build/tools/build-toolchain.sh
View File

@@ -154,13 +154,6 @@ ANDROID_GDBSERVER_OUT=$OUT/gdbserver
ANDROID_GDBSERVER_BUILD=$ANDROID_GDBSERVER_OUT/build ANDROID_GDBSERVER_BUILD=$ANDROID_GDBSERVER_OUT/build
ANDROID_GDBSERVER_DEST=$ANDROID_SYSROOT/usr/bin ANDROID_GDBSERVER_DEST=$ANDROID_SYSROOT/usr/bin
# checks, we need more checks..
mkdir -p $PACKAGE_OUT
if [ $? != 0 ] ; then
echo "Can't create download/archive directory for toolchain tarballs"
exit 2
fi
# Let's check that we have a working md5sum here # Let's check that we have a working md5sum here
A_MD5=`echo "A" | md5sum | cut -d' ' -f1` A_MD5=`echo "A" | md5sum | cut -d' ' -f1`
if [ "$A_MD5" != "bf072e9119077b4e76437a93986787ef" ] ; then if [ "$A_MD5" != "bf072e9119077b4e76437a93986787ef" ] ; then
@@ -182,7 +175,7 @@ download_file ()
echo $1 | grep -q -e "^\(http\|https\):.*" echo $1 | grep -q -e "^\(http\|https\):.*"
if [ $? = 0 ] ; then if [ $? = 0 ] ; then
if [ -n "$WGET" ] ; then if [ -n "$WGET" ] ; then
$WGET -o $2 $1 $WGET -O $2 $1
elif [ -n "$CURL" ] ; then elif [ -n "$CURL" ] ; then
$CURL -o $2 $1 $CURL -o $2 $1
else else
@@ -352,7 +345,7 @@ unpack_package ()
} }
if [ $OPTION_FORCE_DOWNLOAD ] ; then if [ $OPTION_FORCE_DOWNLOAD ] ; then
rm -rf $ANDROID_TOOLCHAIN_SRC rm -rf $PACKAGE_OUT $ANDROID_TOOLCHAIN_SRC
timestamp_force toolchain unpack timestamp_force toolchain unpack
timestamp_force toolchain verify timestamp_force toolchain verify
fi fi
@@ -363,6 +356,13 @@ if [ $OPTION_FORCE_BUILD ] ; then
timestamp_clear gdbserver timestamp_clear gdbserver
fi fi
# checks, we need more checks..
mkdir -p $PACKAGE_OUT
if [ $? != 0 ] ; then
echo "Can't create download/archive directory for toolchain tarballs"
exit 2
fi
download_package toolchain download_package toolchain
unpack_package toolchain $ANDROID_TOOLCHAIN_SRC unpack_package toolchain $ANDROID_TOOLCHAIN_SRC