diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/resources/android/AndroidManifest-test.xml | 14 | ||||
| -rw-r--r-- | make/resources/android/res-test/values/strings.xml | 3 | ||||
| -rw-r--r-- | make/scripts/adb-launch-activity.sh | 5 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 2 |
4 files changed, 19 insertions, 5 deletions
diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index 0251eb505..916f34e05 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -171,8 +171,18 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0" - android:label="@string/activity_moviecube0_name" + <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0a" + android:label="@string/activity_moviecube0a_name" + android:description="@string/activity_moviecube_descr" + android:theme="@android:style/Theme.NoDisplay" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + <activity android:name="com.jogamp.opengl.test.android.MovieCubeActivityLauncher0b" + android:label="@string/activity_moviecube0b_name" android:description="@string/activity_moviecube_descr" android:theme="@android:style/Theme.NoDisplay" > diff --git a/make/resources/android/res-test/values/strings.xml b/make/resources/android/res-test/values/strings.xml index 072cf47e6..0d9acaadb 100644 --- a/make/resources/android/res-test/values/strings.xml +++ b/make/resources/android/res-test/values/strings.xml @@ -29,7 +29,8 @@ <string name="activity_moviesimple1b_name">MovieSimple1b</string> <string name="activity_moviesimple2_name">MovieSimple2</string> <string name="activity_moviesimple_descr">MovieSimple</string> - <string name="activity_moviecube0_name">MovieCube0</string> + <string name="activity_moviecube0a_name">MovieCube0</string> + <string name="activity_moviecube0b_name">MovieCube1</string> <string name="activity_moviecube1a_name">CamCube0</string> <string name="activity_moviecube1b_name">CamCube1</string> <string name="activity_moviecube_descr">MovieCube</string> diff --git a/make/scripts/adb-launch-activity.sh b/make/scripts/adb-launch-activity.sh index 401bd51a6..89acc3c87 100644 --- a/make/scripts/adb-launch-activity.sh +++ b/make/scripts/adb-launch-activity.sh @@ -3,7 +3,10 @@ #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" -ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.MovieCubeActivityLauncher0" +ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.MovieCubeActivityLauncher0a" +#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.MovieCubeActivityLauncher0b" +#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGraphUI1pActivityLauncher" +#ANAME="com.jogamp.opengl.test/com.jogamp.opengl.test.android.NEWTGraphUI2pActivityLauncher" 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/tests.sh b/make/scripts/tests.sh index 1bd30b250..1ab15bc54 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -118,7 +118,7 @@ function jrun() { #D_ARGS="-Djogl.debug.GLBufferStateTracker -Djogl.debug.GLBufferObjectTracker" #D_ARGS="-Djogl.debug.GLBufferObjectTracker" #D_ARGS="-Djogl.debug.GLBufferObjectTracker -Djogl.debug.GLArrayData -Djogl.debug.TraceGL -Djogl.debug.DebugGL" - #D_ARGS="-Djogl.debug.GLSLCode" + D_ARGS="-Djogl.debug.GLSLCode" #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.DebugGL" #D_ARGS="-Djogl.debug.GLContext -Dnativewindow.debug.JAWT -Dnewt.debug.Window" #D_ARGS="-Dnativewindow.debug.JAWT -Djogl.debug.GLCanvas" |