diff options
| author | Sven Gothel <[email protected]> | 2013-01-19 05:45:29 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-01-19 05:45:29 +0100 |
| commit | d171a7ccc65fd284fe7e81ea3ff11d38360387bb (patch) | |
| tree | c89e1bb7af33ddd0836af2e13641f15cd8c08aa5 /make | |
| parent | 2f3b9e92483021b6b678b6111de1294997f3cd74 (diff) | |
Fix ActivityLauncher/MainLauncher .. and make adb-launch-main more suitable
- ActivityLauncher
- no finish() from onDestroy()
- MainLauncher
- finish activity after returning 'main()' returns
- no finish() from onDestroy()
- adb-launch-main:
- Clear logcat
- Wait until activity is stopped
- Dump logcat to local logfile
Diffstat (limited to 'make')
| -rw-r--r-- | make/scripts/adb-launch-main.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/make/scripts/adb-launch-main.sh b/make/scripts/adb-launch-main.sh index 039e2e8..bb2d008 100644 --- a/make/scripts/adb-launch-main.sh +++ b/make/scripts/adb-launch-main.sh @@ -24,10 +24,11 @@ TSTCLASS=com.jogamp.common.GlueGenVersion LOGFILE=`basename $0 .sh`.log -adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall jogamp.android.launcher -adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.common -adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jogamp-android-launcher.apk -adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/gluegen-rt-android-armeabi.apk +#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall jogamp.android.launcher +#adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jogamp-android-launcher.apk + +#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.common +#adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/gluegen-rt-android-armeabi.apk SHELL_CMD="\ cd /sdcard ; \ @@ -35,9 +36,11 @@ if [ -e $TARGET_ROOT ] ; then rm -r $TARGET_ROOT ; fi ; \ mkdir $TARGET_ROOT ; cd $TARGET_ROOT ; \ setprop log.redirect-stdio true ; setprop log.redirect-stderr true ; \ am kill-all ; \ -am start -S -a android.intent.action.MAIN -n jogamp.android.launcher/jogamp.android.launcher.MainLauncher -d launch://jogamp.org/$TSTCLASS/?pkg=com.jogamp.common \ +am start -W -S -a android.intent.action.MAIN -n jogamp.android.launcher/jogamp.android.launcher.MainLauncher -d launch://jogamp.org/$TSTCLASS/?pkg=com.jogamp.common \ " adb connect $TARGET_IP:$TARGET_ADB_PORT +adb -s $TARGET_IP:$TARGET_ADB_PORT logcat -c adb -s $TARGET_IP:$TARGET_ADB_PORT shell $SHELL_CMD 2>&1 | tee $LOGFILE +adb -s $TARGET_IP:$TARGET_ADB_PORT logcat -d 2>&1 | tee $LOGFILE |