3 files changed, 48 insertions, 46 deletions
diff --git a/make/scripts/make.gluegen.all.android-armv6-cross.sh b/make/scripts/make.gluegen.all.android-armv6-cross.sh
index 89161c6..ebbd84c 100755
--- a/make/scripts/make.gluegen.all.android-armv6-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv6-cross.sh
@@ -2,14 +2,30 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then
-    . $SDIR/setenv-build-jogamp-x86_64.sh
+if [ -e ${SDIR}/setenv-build-jogamp-x86_64.sh ] ; then
+    . ${SDIR}/setenv-build-jogamp-x86_64.sh
 fi
 
-if [ -e $SDIR/setenv-android-tools.sh ] ; then
-    . $SDIR/setenv-android-tools.sh
+LOGF=make.gluegen.all.android-armv6-cross.log
+rm -f ${LOGF}
+
+export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64
+export ANDROID_API_LEVEL=24
+export ANDROID_HOST_TAG=linux-x86_64
+export ANDROID_ABI=armeabi-v7a
+
+if [ -e ${SDIR}/setenv-android-tools.sh ] ; then
+    . ${SDIR}/setenv-android-tools.sh >> $LOGF 2>&1
+else
+    echo "${SDIR}/setenv-android-tools.sh doesn't exist!" 2>&1 | tee -a ${LOGF}
+    exit 1
 fi
 
+export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv6.xml"
+export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH}
+echo PATH ${PATH} 2>&1 | tee -a ${LOGF}
+echo clang `which clang` 2>&1 | tee -a ${LOGF}
+
 export NODE_LABEL=.
 
 export HOST_UID=jogamp
@@ -26,32 +42,19 @@ export TARGET_ADB_PORT=5555
 export TARGET_ROOT=/data/projects
 export TARGET_ANT_HOME=/usr/share/ant
 
-export ANDROID_VERSION=24
 export SOURCE_LEVEL=1.8
 export TARGET_LEVEL=1.8
 export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
-export GCC_VERSION=4.9
-HOST_ARCH=linux-x86_64
-export TARGET_TRIPLE=arm-linux-androideabi
-
-export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TARGET_TRIPLE}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
-export TARGET_PLATFORM_SYSROOT=${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_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
-
-export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv6.xml"
-
 #export JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
-which gcc 2>&1 | tee make.gluegen.all.android-armv6-cross.log
-
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 
 #BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-armv6 \
-    $* 2>&1 | tee -a make.gluegen.all.android-armv6-cross.log
+    -Dgcc.compat.compiler=clang \
+    $* 2>&1 | tee -a ${LOGF}
+
diff --git a/make/scripts/make.gluegen.all.android-x86-cross.sh b/make/scripts/make.gluegen.all.android-x86-cross.sh
index d90bc2c..eb0e15b 100755
--- a/make/scripts/make.gluegen.all.android-x86-cross.sh
+++ b/make/scripts/make.gluegen.all.android-x86-cross.sh
@@ -2,14 +2,30 @@
 
 SDIR=`dirname $0` 
 
-if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then
-    . $SDIR/setenv-build-jogamp-x86_64.sh
+if [ -e ${SDIR}/setenv-build-jogamp-x86_64.sh ] ; then
+    . ${SDIR}/setenv-build-jogamp-x86_64.sh
 fi
 
-if [ -e $SDIR/setenv-android-tools.sh ] ; then
-    . $SDIR/setenv-android-tools.sh
+LOGF=make.gluegen.all.android-x86-cross.log
+rm -f ${LOGF}
+
+export ANDROID_HOME=/opt-linux-x86_64/android-sdk-linux_x86_64
+export ANDROID_API_LEVEL=24
+export ANDROID_HOST_TAG=linux-x86_64
+export ANDROID_ABI=x86
+
+if [ -e ${SDIR}/setenv-android-tools.sh ] ; then
+    . ${SDIR}/setenv-android-tools.sh >> $LOGF 2>&1
+else
+    echo "${SDIR}/setenv-android-tools.sh doesn't exist!" 2>&1 | tee -a ${LOGF}
+    exit 1
 fi
 
+export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-x86.xml"
+export PATH=${ANDROID_TOOLCHAIN_ROOT}/${ANDROID_TOOLCHAIN_NAME}/bin:${ANDROID_TOOLCHAIN_ROOT}/bin:${ANDROID_HOME}/platform-tools:${ANDROID_BUILDTOOLS_ROOT}:${PATH}
+echo PATH ${PATH} 2>&1 | tee -a ${LOGF}
+echo clang `which clang` 2>&1 | tee -a ${LOGF}
+
 export NODE_LABEL=.
 
 export HOST_UID=jogamp
@@ -26,37 +42,19 @@ export TARGET_ADB_PORT=5555
 export TARGET_ROOT=/data/projects
 export TARGET_ANT_HOME=/usr/share/ant
 
-export ANDROID_VERSION=24
 export SOURCE_LEVEL=1.8
 export TARGET_LEVEL=1.8
 export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar
 
-export GCC_VERSION=4.9
-HOST_ARCH=linux-x86_64
-export TARGET_TRIPLE=i686-linux-android
-export TOOLCHAIN_NAME=x86
-
-export NDK_TOOLCHAIN_ROOT=$NDK_ROOT/toolchains/${TOOLCHAIN_NAME}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
-export TARGET_PLATFORM_SYSROOT=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-x86
-
-# Need to add toolchain bins to the PATH. 
-# May need to create symbolic links within $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin
-#   cd $NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin
-#   ln -s ../../bin/i686-linux-android-gcc gcc
-export PATH="$NDK_TOOLCHAIN_ROOT/$TARGET_TRIPLE/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/$ANDROID_BUILD_TOOLS_VERSION:$PATH"
-
-export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-x86.xml"
-
 #export JUNIT_DISABLED="true"
 #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
-echo PATH $PATH 2>&1 | tee make.gluegen.all.android-x86-cross.log
-echo gcc `which gcc` 2>&1 | tee -a make.gluegen.all.android-x86-cross.log
-
 #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 
 #BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-x86 \
-    $* 2>&1 | tee -a make.gluegen.all.android-x86-cross.log
+    -Dgcc.compat.compiler=clang \
+    $* 2>&1 | tee -a ${LOGF}
+
diff --git a/make/scripts/setenv-android-tools.sh b/make/scripts/setenv-android-tools.sh
index b0e6144..7f7dd56 100644
--- a/make/scripts/setenv-android-tools.sh
+++ b/make/scripts/setenv-android-tools.sh
@@ -25,7 +25,7 @@
 # - ANDROID_HOST_TAG - defaults to linux-x86_64
 #
 # - ANDROID_ABI - defaults to x86_64, one of
-#        armeabi-v7a 
+#        armeabi-v7a (with NEON by default since NDK r21)
 #        arm64-v8a 
 #        x86_64
 #        x86
@@ -97,6 +97,7 @@ if [ -z "${ANDROID_ABI}" ] ; then
     echo "Setting undefined ANDROID_ABI to ${ANDROID_ABI} default!"
 fi
 if [ "${ANDROID_ABI}" = "armeabi-v7a" ] ; then
+    # with NEON by default since NDK r21
     ANDROID_SYSROOT_ABI=arm
     #CMAKE_SYSTEM_PROCESSOR=armv7-a
     ANDROID_TOOLCHAIN_NAME=arm-linux-androideabi