diff options
| author | Sven Gothel <[email protected]> | 2011-08-05 22:13:11 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-08-05 22:13:11 +0200 |
| commit | d63ca3ad5d2acf20a8ff8f27778ef084b305260c (patch) | |
| tree | 8b8335da71d1fd5a2976d65e2b7e538cbe2cb43a /make | |
| parent | 0f8a1a0d7c6ea2f712f902b57e37cbedc46b1387 (diff) | |
Android hacks: ClassLoaderUtil (vie Dex.., w/ native libs) ; Merged big jar ; eglGetDevice(0) fails
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 7 | ||||
| -rw-r--r-- | make/scripts/crosstest-launch-android-activity.sh | 17 |
2 files changed, 24 insertions, 0 deletions
diff --git a/make/build.xml b/make/build.xml index d6214685f..971406f06 100644 --- a/make/build.xml +++ b/make/build.xml @@ -129,6 +129,7 @@ <path refid="nativewindow_core_atoms.classpath"/> <path refid="jogl_all-mobile_atoms.classpath"/> <path refid="newt_all-android_atoms.classpath"/> + <fileset dir="${build.gluegen}" includes="gluegen-rt.jar"/> <!-- JAU hack in gluegen --> </zips> </archives> </jar> @@ -147,6 +148,9 @@ </target> <target name="android.package" depends="init,gluegen.cpptasks.detect.os,android.package.skip.check" if="isAndroid" unless="android.package.skip"> + <copy todir="${lib}"> + <fileset dir="${build.gluegen}/obj" includes="libgluegen-rt.so"/> <!-- JAU hack in gluegen --> + </copy> <aapt.signed jarbuilddir="${jar}" jarbasename="jogl.all-android" @@ -157,6 +161,9 @@ jarmanifest.path="${build.jogl}/manifest.mf" version.code="${jogl_int_version}" version.name="${jogl.version.plus}" /> + <delete includeEmptyDirs="true" quiet="true" failonerror="false"> + <fileset dir="${lib}" includes="libgluegen-rt.so" /> + </delete> </target> <target name="android.launcher" depends="init,gluegen.cpptasks.detect.os" if="isAndroid"> diff --git a/make/scripts/crosstest-launch-android-activity.sh b/make/scripts/crosstest-launch-android-activity.sh new file mode 100644 index 000000000..c67cbfa11 --- /dev/null +++ b/make/scripts/crosstest-launch-android-activity.sh @@ -0,0 +1,17 @@ +#! /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" + |