2 files changed, 12 insertions, 10 deletions
diff --git a/make/scripts/make.joal.all.android-armv6-cross.sh b/make/scripts/make.joal.all.android-armv6-cross.sh
index ffc8786..7822d14 100755
--- a/make/scripts/make.joal.all.android-armv6-cross.sh
+++ b/make/scripts/make.joal.all.android-armv6-cross.sh
@@ -30,14 +30,14 @@ if [ -z "$NDK_ROOT" ] ; then
     elif [ -e /opt/android-ndk ] ; then
         NDK_ROOT=/opt/android-ndk
     #
-    # Specific android-ndk-r7b
+    # Specific android-ndk-r8d
     #
-    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
+    elif [ -e /usr/local/android-ndk-r8d ] ; then
+        NDK_ROOT=/usr/local/android-ndk-r8d
+    elif [ -e /opt-linux-x86/android-ndk-r8d ] ; then
+        NDK_ROOT=/opt-linux-x86/android-ndk-r8d
+    elif [ -e /opt/android-ndk-r8d ] ; then
+        NDK_ROOT=/opt/android-ndk-r8d
     else 
         echo NDK_ROOT is not specified and does not exist in default locations
         exit 1
@@ -70,7 +70,8 @@ export SOURCE_LEVEL=1.6
 export TARGET_LEVEL=1.6
 export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
 
-export GCC_VERSION=4.4.3
+#export GCC_VERSION=4.4.3
+export GCC_VERSION=4.7
 HOST_ARCH=linux-x86
 export TARGET_TRIPLE=arm-linux-androideabi
 
@@ -78,6 +79,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_VANILLA=$PATH
 export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$PATH"
 
 export GLUEGEN_CPPTASKS_FILE=`pwd`/../../gluegen/make/lib/gluegen-cpptasks-android-armv6.xml
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index e7c4189..db2bc59 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -86,5 +86,5 @@ function testnormal() {
 
 
 #testnormal com.jogamp.openal.test.manual.OpenALTest $*
-#testnormal com.jogamp.openal.test.manual.Sound3DTest $*
-testnormal com.jogamp.openal.test.junit.ALExtLoopbackDeviceSOFTTest $*
+testnormal com.jogamp.openal.test.manual.Sound3DTest $*
+#testnormal com.jogamp.openal.test.junit.ALExtLoopbackDeviceSOFTTest $*