Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-02 20:46:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix to use ANDROID_NDK instead of NDK_ROOT, following fdroid's

Browse source 
convention, but also not to require either if ndk-build is on PATH.
This commit is contained in:
Eric House 2015-04-07 07:07:24 -07:00
parent 6dee7e3784
commit 6721f52ae9
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xwords4/android/scripts/ndkbuild.sh
View file

@ -2,17 +2,23 @@
set -e -u set -e -u
ANDROID_NDK=${ANDROID_NDK:-''}
if [ ! -e build.xml ]; then if [ ! -e build.xml ]; then
echo "no build.xml; please run from root of source tree" echo "no build.xml; please run from root of source tree"
exit 1 exit 1
fi fi
if [ -z "$NDK_ROOT" ]; then if [ -z "$ANDROID_NDK" ]; then
echo -n "NDK_ROOT not set... " if which ndk-build >/dev/null; then
echo "NDK not found; install and set NDK_ROOT to point to it" ANDROID_NDK=$(dirname $(which ndk-build))
exit 1 else
echo -n "ANDROID_NDK not set... "
echo "NDK not found; install and set ANDROID_NDK to point to it"
exit 1
fi
fi fi
${NDK_ROOT}/ndk-build $* ${ANDROID_NDK}/ndk-build $*
echo "$0 done" echo "$0 done"