Android build scripts: Fix env. name ANDROID_SDK_HOME -> ANDROID_HOME

Intuitively I assumed ANDROID_SDK_HOME to be pointing to the SDK root dir,
however this is not true: Semantics by Android tools are:

ANDROID_SDK_HOME - Users ~/.android folder
ANDROID_HOME     - SDK root folder

4 files changed, 24 insertions, 24 deletions

diff --git a/make/scripts/crosstest-java-android-armv7-rel.sh b/make/scripts/crosstest-java-android-armv7-rel.sh
index 1d5aa67..613e014 100644
--- a/make/scripts/crosstest-java-android-armv7-rel.sh
+++ b/make/scripts/crosstest-java-android-armv7-rel.sh
@@ -11,8 +11,8 @@ export TARGET_ROOT=/projects
 export BUILD_DIR=../build-android-armv7
 
 if [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then
-    export ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86
-    export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH
+    export ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
+    export PATH=$ANDROID_HOME/platform-tools:$PATH
 fi 
 
 #
diff --git a/make/scripts/crosstest-junit-android-armv7-rel.sh b/make/scripts/crosstest-junit-android-armv7-rel.sh
index c22217b..3d5ada1 100644
--- a/make/scripts/crosstest-junit-android-armv7-rel.sh
+++ b/make/scripts/crosstest-junit-android-armv7-rel.sh
@@ -11,8 +11,8 @@ export TARGET_ROOT=/projects
 export BUILD_DIR=../build-android-armv7
 
 if [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then
-    export ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86
-    export PATH=$ANDROID_SDK_HOME/platform-tools:$PATH
+    export ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
+    export PATH=$ANDROID_HOME/platform-tools:$PATH
 fi 
 
 #
diff --git a/make/scripts/make.gluegen.all.android-armv6-cross.sh b/make/scripts/make.gluegen.all.android-armv6-cross.sh
index 9744b3d..a4c5916 100755
--- a/make/scripts/make.gluegen.all.android-armv6-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv6-cross.sh
@@ -16,7 +16,7 @@ export TARGET_ADB_PORT=5555
 export TARGET_ROOT=/data/projects
 export TARGET_ANT_HOME=/usr/share/ant
 
-echo ANDROID_SDK_HOME $ANDROID_SDK_HOME
+echo ANDROID_HOME $ANDROID_HOME
 echo NDK_ROOT $NDK_ROOT
 
 if [ -z "$NDK_ROOT" ] ; then
@@ -48,22 +48,22 @@ elif [ ! -e $NDK_ROOT ] ; then
 fi
 export NDK_ROOT
 
-if [ -z "$ANDROID_SDK_HOME" ] ; then
+if [ -z "$ANDROID_HOME" ] ; then
     if [ -e /usr/local/android-sdk-linux_x86 ] ; then
-        ANDROID_SDK_HOME=/usr/local/android-sdk-linux_x86
+        ANDROID_HOME=/usr/local/android-sdk-linux_x86
     elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then
-        ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86
+        ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
     elif [ -e /opt/android-sdk-linux_x86 ] ; then
-        ANDROID_SDK_HOME=/opt/android-sdk-linux_x86
+        ANDROID_HOME=/opt/android-sdk-linux_x86
     else 
-        echo ANDROID_SDK_HOME is not specified and does not exist in default locations
+        echo ANDROID_HOME is not specified and does not exist in default locations
         exit 1
     fi
-elif [ ! -e $ANDROID_SDK_HOME ] ; then
-    echo ANDROID_SDK_HOME $ANDROID_SDK_HOME does not exist
+elif [ ! -e $ANDROID_HOME ] ; then
+    echo ANDROID_HOME $ANDROID_HOME does not exist
     exit 1
 fi
-export ANDROID_SDK_HOME
+export ANDROID_HOME
 
 export ANDROID_VERSION=9
 export SOURCE_LEVEL=1.6
@@ -78,7 +78,7 @@ export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/p
 export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm
 
 # Need to add toolchain bins to the PATH. 
-export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_SDK_HOME/platform-tools:$PATH"
+export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$PATH"
 
 export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv6.xml"
 
diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh
index 5572479..3f64c58 100755
--- a/make/scripts/make.gluegen.all.android-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv7-cross.sh
@@ -16,7 +16,7 @@ export TARGET_ADB_PORT=5555
 export TARGET_ROOT=/data/projects
 export TARGET_ANT_HOME=/usr/share/ant
 
-echo ANDROID_SDK_HOME $ANDROID_SDK_HOME
+echo ANDROID_HOME $ANDROID_HOME
 echo NDK_ROOT $NDK_ROOT
 
 if [ -z "$NDK_ROOT" ] ; then
@@ -48,22 +48,22 @@ elif [ ! -e $NDK_ROOT ] ; then
 fi
 export NDK_ROOT
 
-if [ -z "$ANDROID_SDK_HOME" ] ; then
+if [ -z "$ANDROID_HOME" ] ; then
     if [ -e /usr/local/android-sdk-linux_x86 ] ; then
-        ANDROID_SDK_HOME=/usr/local/android-sdk-linux_x86
+        ANDROID_HOME=/usr/local/android-sdk-linux_x86
     elif [ -e /opt-linux-x86/android-sdk-linux_x86 ] ; then
-        ANDROID_SDK_HOME=/opt-linux-x86/android-sdk-linux_x86
+        ANDROID_HOME=/opt-linux-x86/android-sdk-linux_x86
     elif [ -e /opt/android-sdk-linux_x86 ] ; then
-        ANDROID_SDK_HOME=/opt/android-sdk-linux_x86
+        ANDROID_HOME=/opt/android-sdk-linux_x86
     else 
-        echo ANDROID_SDK_HOME is not specified and does not exist in default locations
+        echo ANDROID_HOME is not specified and does not exist in default locations
         exit 1
     fi
-elif [ ! -e $ANDROID_SDK_HOME ] ; then
-    echo ANDROID_SDK_HOME $ANDROID_SDK_HOME does not exist
+elif [ ! -e $ANDROID_HOME ] ; then
+    echo ANDROID_HOME $ANDROID_HOME does not exist
     exit 1
 fi
-export ANDROID_SDK_HOME
+export ANDROID_HOME
 
 export ANDROID_VERSION=9
 export SOURCE_LEVEL=1.6
@@ -78,7 +78,7 @@ export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/p
 export TARGET_PLATFORM_ROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm
 
 # Need to add toolchain bins to the PATH. 
-export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_SDK_HOME/platform-tools:$PATH"
+export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$PATH"
 
 export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv7.xml"