diff options
| author | Sven Gothel <[email protected]> | 2012-06-15 05:21:43 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-06-15 05:21:43 +0200 |
| commit | 54d0ff131097a2cd9a91a0c1dd84deb8b1f7d0ac (patch) | |
| tree | cea4abac21e1447c8725e8bd28abf031be4dbedd /make/scripts/adb-launch-main.sh | |
| parent | cf51a97f04011ce643c42d6872f37cc69f4342aa (diff) | |
Fix Bug 583: Remove Android compile-time dependencies and exclude Android specific classes for non Android platforms.
Adapt to GlueGen commits: b3c9951006f9bd863244f1db3d54ac7866d66f0a, 86c1df6fdca183454ff544857f4236b646c4730d
Ensure same Java JAR content regardless of build target (fix).
Separate Android compilation results: jogl.all-android.jar and jogl.test-android.jar
avoiding generating different content w/ non android builds.
Adding ${android.abi} to APK target name (jogl.all-android.apk -> jogl.all-android-armeabi-v7a.apk)
if not generic.
Diffstat (limited to 'make/scripts/adb-launch-main.sh')
| -rw-r--r-- | make/scripts/adb-launch-main.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make/scripts/adb-launch-main.sh b/make/scripts/adb-launch-main.sh index 0887c107f..ff47a7ab0 100644 --- a/make/scripts/adb-launch-main.sh +++ b/make/scripts/adb-launch-main.sh @@ -61,7 +61,7 @@ am start -a android.intent.action.MAIN -n jogamp.android.launcher/jogamp.android # \ #dalvikvm \ # -Xjnigreflimit:2000 \ -# -cp ../../gluegen/make/$BUILD_DIR/jogamp.android-launcher.apk:../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt.apk:$BUILD_DIR/jar/jogl.all-android.apk:$BUILD_DIR/jar/jogl.test.apk:$BUILD_DIR/jar/jogl.android-launcher.apk \ +# -cp ../../gluegen/make/$BUILD_DIR/jogamp.android-launcher.apk:../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt-android-armeabi-v7a.apk:$BUILD_DIR/jar/jogl.all-android-armeabi-v7a.apk:$BUILD_DIR/jar/jogl.test.apk \ # -Dgluegen.root=../../gluegen \ # -Drootrel.build=build-android-armv7 \ # com.android.internal.util.WithFramework \ |