summaryrefslogtreecommitdiffstats
path: root/make/build-common.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-03-14 23:17:35 +0100
committerSven Gothel <[email protected]>2012-03-14 23:17:35 +0100
commita40e22a58e0c71a95f11b7c7e83247fbd4a4d94f (patch)
tree5310a3b2863b53a0d514e176bc157030c9d5e737 /make/build-common.xml
parentf814983eea2ceaca149d3c425356512f5f095d37 (diff)
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)
Diffstat (limited to 'make/build-common.xml')
-rw-r--r--make/build-common.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index e560cd8b9..c18cf89b4 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -466,7 +466,7 @@
<property name="junit_jogl_noawt.run.jars"
value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/>
<property name="junit_jogl_noawt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/>
- <property name="junit.run.remote.apks" value="${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt.apk${path.separator}${jogl.all-android.apk}${path.separator}${jogl.test.apk}"/>
+ <property name="junit.run.remote.apks" value="${gluegen.root}/${rootrel.build}/jogamp.android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt.apk${path.separator}${jogl.all-android.apk}${path.separator}${jogl.test.apk}"/>
<!-- Test Run w/ SWT .. -->
<path id="junit_jogl_swt.run.classpath">