6 files changed, 106 insertions, 13 deletions
diff --git a/make/scripts/crosstest-java-android-armv7-rel.sh b/make/scripts/crosstest-java-android-armv7-rel.sh
new file mode 100644
index 000000000..d4c93d7c8
--- /dev/null
+++ b/make/scripts/crosstest-java-android-armv7-rel.sh
@@ -0,0 +1,69 @@
+#! /bin/bash
+
+export HOST_UID=sven
+export HOST_IP=192.168.0.52
+export HOST_RSYNC_ROOT=PROJECTS/JOGL
+
+export TARGET_UID=jogamp
+export TARGET_IP=beagle02
+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
+fi 
+
+#
+# orig android:
+#   export LD_LIBRARY_PATH /system/lib
+#   export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar
+#
+
+#TSTCLASS=com.jogamp.nativewindow.NativeWindowVersion
+#TSTCLASS=com.jogamp.opengl.JoglVersion
+#TSTCLASS=com.jogamp.newt.NewtVersion
+TSTCLASS=com.jogamp.newt.opengl.GLWindow
+#TSTCLASS=com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT
+#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT
+#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState01NEWT
+#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT
+#TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01
+#TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01
+#TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02
+#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT
+
+
+LOGFILE=`basename $0 .sh`.log
+
+#  -Djava.class.path=lib/junit.jar:/usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-junit.jar:$BUILD_DIR/gluegen.jar:$BUILD_DIR/test/build/gluegen-test.jar \
+#  -Djava.class.path=lib/ant-junit-all.apk:$BUILD_DIR/gluegen-rt.apk \
+#  -Djava.library.path=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/test/build/natives \
+
+RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux*/' --exclude 'build-win*/' --exclude 'build-mac*/' \
+                --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'jogl-java-src.zip' \
+                --delete-excluded"
+
+echo "#! /system/bin/sh" > $BUILD_DIR/targetcommand.sh
+
+echo "\
+rsync -av --delete --delete-after $RSYNC_EXCLUDES $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/gluegen $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/jogl $TARGET_ROOT ; \
+cd $TARGET_ROOT/jogl/make ;
+export LD_LIBRARY_PATH=/system/lib:$TARGET_ROOT/gluegen/make/$BUILD_DIR/obj:$TARGET_ROOT/jogl/make/$BUILD_DIR/lib ; \
+export BOOTCLASSPATH=/system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar ; \
+dalvikvm \
+  -Xjnigreflimit:2000 \
+  -cp ../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt.apk:$BUILD_DIR/jar/jogl.all-android.apk:$BUILD_DIR/test/build/jogl.test.jar \
+  -Djogamp.debug.JNILibLoader=true \
+  -Djogamp.debug.NativeLibrary=true \
+  -Djogamp.debug.NativeLibrary.Lookup=true \
+  -Djogl.debug=all \
+  com.android.internal.util.WithFramework \
+  $TSTCLASS \
+" >> $BUILD_DIR/targetcommand.sh
+
+chmod ugo+x $BUILD_DIR/targetcommand.sh
+adb push $BUILD_DIR/targetcommand.sh $TARGET_ROOT/targetcommand.sh
+adb shell $TARGET_ROOT/targetcommand.sh 2>&1 | tee $LOGFILE
+
diff --git a/make/scripts/crosstest-java-linux-armv7-rel.sh b/make/scripts/crosstest-java-linux-armv7-rel.sh
index f89d02144..c274dab18 100644
--- a/make/scripts/crosstest-java-linux-armv7-rel.sh
+++ b/make/scripts/crosstest-java-linux-armv7-rel.sh
@@ -13,7 +13,7 @@ export ANT_PATH=/usr/share/ant
 
 #TSTCLASS=com.jogamp.nativewindow.NativeWindowVersion
 #TSTCLASS=com.jogamp.opengl.JoglVersion
-#TSTCLASS=com.jogamp.newt.NewtVersion
+TSTCLASS=com.jogamp.newt.NewtVersion
 #TSTCLASS=com.jogamp.newt.opengl.GLWindow
 #TSTCLASS=com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT
 #TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT
@@ -22,25 +22,26 @@ export ANT_PATH=/usr/share/ant
 #TSTCLASS=com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01
 #TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01
 #TSTCLASS=com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02
-TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT
+#TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT
 
 LOGFILE=`basename $0 .sh`.log
 
 #  -Djogamp.debug.NativeLibrary.Lookup=true \
 #  -Djogamp.debug.ProcAddressHelper=true \
 
+RSYNC_EXCLUDES="--exclude 'build-x86*/' --exclude 'build-linux-x*/' --exclude 'build-android*/' --exclude 'build-win*/' --exclude 'build-mac*/' \
+                --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude 'jogl-java-src.zip' \
+                --delete-excluded"
+
 CP_BASE=../../gluegen/make/lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:../../gluegen/make/$BUILD_DIR/gluegen.jar
-CP_JOGL_ALL=$BUILD_DIR/jar/nativewindow.all.jar:$BUILD_DIR/jar/jogl.all.jar:$BUILD_DIR/jar/newt.all.jar:$BUILD_DIR/jar/jogl.test.jar
-CP_JOGL_EGLES12=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles1.jar:$BUILD_DIR/jar/jogl.gles1.dbg.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar
-CP_JOGL_EGLES1=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles1.jar:$BUILD_DIR/jar/jogl.gles1.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar
-CP_JOGL_EGLES2=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar
+CP_JOGL_MOBILE=$BUILD_DIR/jar/jogl.all-mobile.jar:$BUILD_DIR/test/build/jogl.test.jar
 
 #  -Djogl.debug=all \
 #  -Dnewt.debug=all \
 #  -Djogl.debug.DebugGL \
 
 ssh $TARGET_UID@$TARGET_IP "\
-rsync -aAv --delete --delete-after --exclude 'build-x86*/' $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/gluegen $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/jogl $TARGET_ROOT ; \
+rsync -aAv --delete --delete-after $RSYNC_EXCLUDES $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/gluegen $HOST_UID@$HOST_IP::$HOST_RSYNC_ROOT/jogl $TARGET_ROOT ; \
 cd $TARGET_ROOT/jogl/make ;
 export DISPLAY=:0.0 ;
 LD_LIBRARY_PATH=../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \
@@ -48,7 +49,7 @@ $TARGET_JAVA \
   -server \
   -Xmx256m \
   -Djava.library.path=../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \
-  -Djava.class.path=$CP_BASE:$CP_JOGL_EGLES12 \
+  -Djava.class.path=$CP_BASE:$CP_JOGL_MOBILE \
   -Dnativewindow.x11.mt-bug=true \
   $TSTCLASS $* \
  2>&1 | tee $LOGFILE \
diff --git a/make/scripts/crosstest-launch-android-activity.sh b/make/scripts/crosstest-launch-android-activity.sh
new file mode 100644
index 000000000..c67cbfa11
--- /dev/null
+++ b/make/scripts/crosstest-launch-android-activity.sh
@@ -0,0 +1,17 @@
+#! /bin/sh
+
+#adb uninstall com.jogamp.common
+#adb install ../../gluegen/build-android-armv7/gluegen-rt.apk
+
+adb uninstall javax.media.opengl
+adb install ../build-android-armv7/jar/jogl.all-android.apk 
+
+adb shell "setprop log.redirect-stdio true ; setprop log.redirect-stderr true ; \
+           am start -a android.intent.action.MAIN -n javax.media.opengl/jogamp.newt.driver.android.NewtVersionActivity"
+
+#adb uninstall com.jogamp.android.launcher
+#adb install ../build-android-armv7/android/jar/jogllauncher.apk 
+
+#adb shell "setprop log.redirect-stdio true ; setprop log.redirect-stderr true ; \
+#           am start -a android.intent.action.MAIN -n com.jogamp.android.launcher/com.jogamp.android.launcher.NEWTLauncherVersionActivity"
+
diff --git a/make/scripts/eglestest-java-linux.sh b/make/scripts/eglestest-java-linux.sh
index 399da11b5..3151d9d1e 100644
--- a/make/scripts/eglestest-java-linux.sh
+++ b/make/scripts/eglestest-java-linux.sh
@@ -20,6 +20,7 @@ TSTCLASS=com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2E
 
 LOGFILE=`basename $0 .sh`.log
 
+#  -Djogamp.debug.NativeLibrary=true \
 #  -Djogamp.debug.NativeLibrary.Lookup=true \
 #  -Djogamp.debug.ProcAddressHelper=true \
 #  -Djogamp.debug=all \
@@ -28,13 +29,16 @@ LOGFILE=`basename $0 .sh`.log
 #  -Dnewt.debug=all \
 
 CP_BASE=../../gluegen/make/lib/junit.jar:$ANT_PATH/lib/ant.jar:$ANT_PATH/lib/ant-junit.jar:../../gluegen/make/$BUILD_DIR/gluegen.jar
-CP_JOGL_ALL=$BUILD_DIR/jar/nativewindow.all.jar:$BUILD_DIR/jar/jogl.all.jar:$BUILD_DIR/jar/newt.all.jar:$BUILD_DIR/jar/jogl.test.jar
-CP_JOGL_EGLES=$BUILD_DIR/jar/nativewindow.all-noawt.jar:$BUILD_DIR/jar/jogl.core.jar:$BUILD_DIR/jar/jogl.util.jar:$BUILD_DIR/jar/jogl.gles1.jar:$BUILD_DIR/jar/jogl.gles1.dbg.jar:$BUILD_DIR/jar/jogl.gles2.jar:$BUILD_DIR/jar/jogl.gles2.dbg.jar:$BUILD_DIR/jar/jogl.egl.jar:$BUILD_DIR/jar/jogl.util.fixedfuncemu.jar:$BUILD_DIR/jar/jogl.glu.tess.jar:$BUILD_DIR/jar/jogl.glu.mipmap.jar:$BUILD_DIR/jar/newt.all-noawt.jar:$BUILD_DIR/jar/jogl.test.jar
+CP_JOGL_ALL=$BUILD_DIR/jar/jogl.all.jar:$BUILD_DIR/test/build/jogl.test.jar
+CP_JOGL_MOBILE=$BUILD_DIR/jar/jogl.all-mobile.jar:$BUILD_DIR/test/build/jogl.test.jar
 
 export DISPLAY=:0.0 ;
 java \
   -Djava.library.path=../../gluegen/make/$BUILD_DIR/obj:$BUILD_DIR/lib \
-  -Djava.class.path=$CP_BASE:$CP_JOGL_EGLES \
+  -Djava.class.path=$CP_BASE:$CP_JOGL_MOBILE \
+  -Djogamp.debug.NativeLibrary=true \
+  -Dnativewindow.debug=all \
+  -Djogl.debug=all \
   $TSTCLASS $* \
  2>&1 | tee $LOGFILE \
 
diff --git a/make/scripts/make.jogl.all.android-armv7-cross.sh b/make/scripts/make.jogl.all.android-armv7-cross.sh
index cbc5bda29..37a5c4c35 100755
--- a/make/scripts/make.jogl.all.android-armv7-cross.sh
+++ b/make/scripts/make.jogl.all.android-armv7-cross.sh
@@ -64,6 +64,7 @@ TARGET_FPU_ABI=softfp
 export TARGET_TOOL_PATH=${NDK_ROOT}/toolchains/${TARGET_ARCH}-${GCC_VERSION}/prebuilt/${HOST_ARCH}
 
 export TARGET_OS_PATH=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-arm/usr
+export TARGET_PLATFORM_LIBS=${TARGET_OS_PATH}/lib
 export HOST_OS_PATH=${NDK_ROOT}/platforms/android-${ANDROID_VERSION}/arch-x86/usr
 
 export NDK_XBIN_PATH=${TARGET_TOOL_PATH}/bin
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index b4f635cd5..678b48b24 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -142,7 +142,7 @@ function testawtmt() {
 #testnoawt com.jogamp.opengl.test.junit.newt.TestRemoteGLWindows01NEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $*
-testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2ES1NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $*
 #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT
 #testawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT
@@ -174,7 +174,8 @@ testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2es1.gears.newt.TestGearsGL2
 #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT
 #testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT
 #testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417
-#testawtmt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $*
+#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $*
+testawt com.jogamp.opengl.test.junit.jogl.glu.TestBug463ScaleImageMemoryAWT $*
 
 #
 # newt.awt (testawt)