Android Tests: Using JogAmp's ActivityLauncher (gluegen commit: 0cfc7847c58b51c9a26b50d905b592d1fc4c8578)

- Remove jogl.android-launcher.apk in favor of generic jogamp.android-launcher.apk

- All Android test code resides in jogl.test.apk (initial launcher and delegated 'real' one)

7 files changed, 84 insertions, 90 deletions

diff --git a/make/scripts/adb-install-all-armv7.sh b/make/scripts/adb-install-all-armv7.sh
index d48d0abba..503c6f2f7 100755
--- a/make/scripts/adb-install-all-armv7.sh
+++ b/make/scripts/adb-install-all-armv7.sh
@@ -1,4 +1,4 @@
+adb $* install ../../gluegen/build-android-armv7/jogamp.android-launcher.apk
 adb $* install ../../gluegen/build-android-armv7/gluegen-rt.apk
 adb $* install ../build-android-armv7/jar/jogl.all-android.apk
-adb $* install ../build-android-armv7/jar/jogl.android-launcher.apk
 adb $* install ../build-android-armv7/jar/jogl.test.apk
diff --git a/make/scripts/adb-launch-activity.sh b/make/scripts/adb-launch-activity.sh
new file mode 100644
index 000000000..84399520e
--- /dev/null
+++ b/make/scripts/adb-launch-activity.sh
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGenericActivity"
+#ANAME="com.jogamp.android.launcher/com.jogamp.android.launcher.NEWTLauncherActivity2"
+ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGearsES2ActivityLauncher"
+
+adb $* shell "setprop log.redirect-stdio true ; setprop log.redirect-stderr true ; \
+              am start -a android.intent.action.MAIN -n $ANAME"
+
+
+
diff --git a/make/scripts/adb-launch-main.sh b/make/scripts/adb-launch-main.sh
new file mode 100644
index 000000000..7e32165d2
--- /dev/null
+++ b/make/scripts/adb-launch-main.sh
@@ -0,0 +1,69 @@
+#! /bin/bash
+
+export HOST_UID=jogamp
+# jogamp02 - 10.1.0.122
+export HOST_IP=10.1.0.122
+export HOST_RSYNC_ROOT=PROJECTS/JOGL
+
+export TARGET_UID=jogamp
+export TARGET_IP=panda02
+export TARGET_ADB_PORT=5555
+export TARGET_ROOT=/data/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 
+
+TSTCLASS=jogamp.android.launcher.LauncherUtil
+#TSTCLASS=com.jogamp.opengl.test.android.LauncherUtil
+#TSTCLASS=com.jogamp.android.launcher.NEWTLauncherMain
+#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
+
+RSYNC_EXCLUDES="--delete-excluded \
+                --exclude 'build-x86*/' --exclude 'build-linux*/' --exclude 'build-win*/' --exclude 'build-mac*/' \
+                --exclude 'classes/' --exclude 'src/' --exclude '.git/' --exclude '*-java-src.zip' \
+                --exclude 'gensrc/' --exclude 'doc/' --exclude 'jnlp-files' --exclude 'archive/' \
+                --exclude 'android-sdk/' --exclude 'resources/' --exclude 'scripts/' \
+                --exclude 'stub_includes/' --exclude 'nbproject/' --exclude '*.log' --exclude '*.zip' --exclude '*.7z'"
+
+echo "#! /system/bin/sh" > $BUILD_DIR/jogl-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/$BUILD_DIR/jogamp.android-launcher.apk:../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt.apk:$BUILD_DIR/jar/jogl.all-android.apk:$BUILD_DIR/jar/jogl.test.apk:$BUILD_DIR/jar/jogl.android-launcher.apk \
+  -Dgluegen.root=../../gluegen \
+  -Drootrel.build=build-android-armv7 \
+  com.android.internal.util.WithFramework \
+  $TSTCLASS \
+" >> $BUILD_DIR/jogl-targetcommand.sh
+
+chmod ugo+x $BUILD_DIR/jogl-targetcommand.sh
+adb connect $TARGET_IP:$TARGET_ADB_PORT
+adb -s $TARGET_IP:$TARGET_ADB_PORT push $BUILD_DIR/jogl-targetcommand.sh $TARGET_ROOT/jogl-targetcommand.sh
+adb -s $TARGET_IP:$TARGET_ADB_PORT shell su -c $TARGET_ROOT/jogl-targetcommand.sh 2>&1 | tee $LOGFILE
+
+
diff --git a/make/scripts/adb-uninstall-all.sh b/make/scripts/adb-uninstall-all.sh
index 3e65e128c..1605a0e35 100755
--- a/make/scripts/adb-uninstall-all.sh
+++ b/make/scripts/adb-uninstall-all.sh
@@ -1,4 +1,4 @@
+adb $* uninstall jogamp.android.launcher
 adb $* uninstall com.jogamp.common
 adb $* uninstall javax.media.opengl
-adb $* uninstall com.jogamp.android.launcher
 adb $* uninstall com.jogamp.opengl.test
diff --git a/make/scripts/crosstest-java-android-armv7-rel.sh b/make/scripts/crosstest-java-android-armv7-rel.sh
deleted file mode 100644
index 8d9ae27f9..000000000
--- a/make/scripts/crosstest-java-android-armv7-rel.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /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/jar/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-launch-android-activity.sh b/make/scripts/crosstest-launch-android-activity.sh
deleted file mode 100644
index c67cbfa11..000000000
--- a/make/scripts/crosstest-launch-android-activity.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /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/tests.sh b/make/scripts/tests.sh
index c61b03fab..c0db411dc 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -205,7 +205,7 @@ function testawtswt() {
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestGearsES1NEWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
-testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es1.newt.TestRedSquareES1NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestRedSquareES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $*
@@ -214,7 +214,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle02NEWT
-#testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting01NEWT $*
+testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting02NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode00bNEWT