summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-03-06 19:36:51 +0100
committerSven Gothel <[email protected]>2012-03-06 19:36:51 +0100
commitbf03a3c4db9550f890e7ea5b0b46962ecaa66a92 (patch)
treea4ad01ac70b15a68a04447e607df1e3ae1a9e422
parentb31f1885fab139fb3dde9f04304406402650eb83 (diff)
android crosscompile script, use android-ndk-r7b but favor generic android-ndk (sym-link)
-rwxr-xr-xmake/scripts/make.gluegen.all.android-armv7-cross.sh24
1 files changed, 18 insertions, 6 deletions
diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh
index 31b544d..7d27d6f 100755
--- a/make/scripts/make.gluegen.all.android-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv7-cross.sh
@@ -15,12 +15,24 @@ echo ANDROID_SDK_HOME $ANDROID_SDK_HOME
echo NDK_ROOT $NDK_ROOT
if [ -z "$NDK_ROOT" ] ; then
- if [ -e /usr/local/android-ndk-r7 ] ; then
- NDK_ROOT=/usr/local/android-ndk-r7
- elif [ -e /opt-linux-x86/android-ndk-r7 ] ; then
- NDK_ROOT=/opt-linux-x86/android-ndk-r7
- elif [ -e /opt/android-ndk-r7 ] ; then
- NDK_ROOT=/opt/android-ndk-r7
+ #
+ # Generic android-ndk
+ #
+ if [ -e /usr/local/android-ndk ] ; then
+ NDK_ROOT=/usr/local/android-ndk
+ elif [ -e /opt-linux-x86/android-ndk ] ; then
+ NDK_ROOT=/opt-linux-x86/android-ndk
+ elif [ -e /opt/android-ndk ] ; then
+ NDK_ROOT=/opt/android-ndk
+ #
+ # Specific android-ndk-r7b
+ #
+ elif [ -e /usr/local/android-ndk-r7b ] ; then
+ NDK_ROOT=/usr/local/android-ndk-r7b
+ elif [ -e /opt-linux-x86/android-ndk-r7b ] ; then
+ NDK_ROOT=/opt-linux-x86/android-ndk-r7b
+ elif [ -e /opt/android-ndk-r7b ] ; then
+ NDK_ROOT=/opt/android-ndk-r7b
else
echo NDK_ROOT is not specified and does not exist in default locations
exit 1