diff options
| author | Sven Gothel <[email protected]> | 2012-03-14 23:17:35 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-03-14 23:17:35 +0100 |
| commit | a40e22a58e0c71a95f11b7c7e83247fbd4a4d94f (patch) | |
| tree | 5310a3b2863b53a0d514e176bc157030c9d5e737 /make/build-test.xml | |
| parent | f814983eea2ceaca149d3c425356512f5f095d37 (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-test.xml')
| -rw-r--r-- | make/build-test.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 8a3bb3d24..3e33c2ff8 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -65,7 +65,7 @@ nativebasename="non-existing" android.abi="${android.abi}" androidmanifest.path="resources/android/AndroidManifest-test.xml" - androidresources.path="resources/android/res-jogl" + androidresources.path="resources/android/res-test" jarmanifest.path="${build.jogl}/manifest.mf" version.code="${jogl_int_version}" version.name="${jogl.version.plus}" /> @@ -110,7 +110,8 @@ <uptodate property="test.compile.skip"> <srcfiles dir= "." includes="*.xml"/> <srcfiles dir= "${src.test}" includes="**"/> - <srcfiles file="${gluegen.jar}" /> + <srcfiles dir= "resources/android" includes="**/*.xml"/> + <srcfiles file="${gluegen-rt.jar}" /> <srcfiles dir="${src}/nativewindow" /> <srcfiles dir="${src}/jogl" /> <srcfiles dir="${src}/newt" /> @@ -850,7 +851,7 @@ ${line.separator} chmod 0755 ${build.test}/targetcommand.sh ; adb connect ${env.TARGET_IP}:${env.TARGET_ADB_PORT} ; adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} push ${build.test}/targetcommand.sh ${env.TARGET_ROOT}/jogl-targetcommand.sh ; - adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} shell ${env.TARGET_ROOT}/jogl-targetcommand.sh ; + adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} shell su -c ${env.TARGET_ROOT}/jogl-targetcommand.sh ; adb -s ${env.TARGET_IP}:${env.TARGET_ADB_PORT} pull ${env.TARGET_ROOT}/${jogl.basename}/${env.NODE_LABEL}/make/${results.test}/ ${results.test}/ "'/> </exec> </target> |