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

am 110f6cd9: am 6d0ef0df: ndk: handle --verbose option in tests/run-all.sh script

Browse Source 
Merge commit '110f6cd94a5c2f68ffc19223679d8c16b6d3ab51'

* commit '110f6cd94a5c2f68ffc19223679d8c16b6d3ab51':
  ndk: handle --verbose option in tests/run-all.sh script
This commit is contained in:
David 'Digit' Turner
2010-07-16 16:24:55 -07:00
committed by Android Git Automerger
parent 66aad28a21 110f6cd94a
commit 08cd7cacf3
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ndk/tests/run-all.sh
View File

@@ -78,6 +78,17 @@ mkdir -p `dirname $MYLOG`
rm -f $MYLOG rm -f $MYLOG
echo "NDK automated tests log file" > $MYLOG echo "NDK automated tests log file" > $MYLOG
if [ "$VERBOSE" = "yes" ] ; then
run ()
{
$NDK/ndk-build -B $JOBS 2>&1
}
else
run ()
{
$NDK/ndk-build -B $JOBS >> $MYLOG 2>&1
}
fi
# #
# Rebuild all samples first # Rebuild all samples first
@@ -86,9 +97,9 @@ build_sample ()
{ {
echo "Building NDK sample: $1" echo "Building NDK sample: $1"
cd $PROGDIR/../samples/$1 cd $PROGDIR/../samples/$1
$NDK/ndk-build -B $JOBS >> $MYLOG 2>&1 run $NDK/ndk-build -B $JOBS
if [ $? != 0 ] ; then if [ $? != 0 ] ; then
echo "!!! BUILD FAILURE !!!" echo "!!! BUILD FAILURE !!! See $MYLOG for details or use --verbose option!"
exit 1 exit 1
fi fi
} }