mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-23 07:27:22 +01:00
fix to use ANDROID_NDK instead of NDK_ROOT, following fdroid's
convention, but also not to require either if ndk-build is on PATH.
This commit is contained in:
parent
6dee7e3784
commit
6721f52ae9
1 changed files with 11 additions and 5 deletions
|
@ -2,17 +2,23 @@
|
|||
|
||||
set -e -u
|
||||
|
||||
ANDROID_NDK=${ANDROID_NDK:-''}
|
||||
|
||||
if [ ! -e build.xml ]; then
|
||||
echo "no build.xml; please run from root of source tree"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$NDK_ROOT" ]; then
|
||||
echo -n "NDK_ROOT not set... "
|
||||
echo "NDK not found; install and set NDK_ROOT to point to it"
|
||||
exit 1
|
||||
if [ -z "$ANDROID_NDK" ]; then
|
||||
if which ndk-build >/dev/null; then
|
||||
ANDROID_NDK=$(dirname $(which ndk-build))
|
||||
else
|
||||
echo -n "ANDROID_NDK not set... "
|
||||
echo "NDK not found; install and set ANDROID_NDK to point to it"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
${NDK_ROOT}/ndk-build $*
|
||||
${ANDROID_NDK}/ndk-build $*
|
||||
|
||||
echo "$0 done"
|
||||
|
|
Loading…
Add table
Reference in a new issue