diff options
| author | Sven Gothel <[email protected]> | 2012-01-22 18:24:23 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-01-22 18:24:23 +0100 |
| commit | 64639b805a32338385421f168e12c1ef7f749d00 (patch) | |
| tree | 6b027d14cf4b9cfe2a8db72ed8a000d98fca036a /make/jogamp-androidtasks.xml | |
| parent | 36c99b43e09999a560a086be10e392aad915b1f3 (diff) | |
Fix Bug 516 (Determine Java Version); Minor fixes (jogamp/common/** ..)
Current minimum requirements are:
- Java 1.6 (Level 6.0)
- Android SDK API Level 9 (Version 2.3 Gingerbread)
Official production builds are performed w/ Java 1.6.
- Java 1.6 (Level 6.0)
- Android SDK API Level 9 (Version 2.3 Gingerbread)
Android supports Java language level 6.0.
Nevertheless, it cannot be guaranteed whether the Android API
supports all classes and methods of Java 1.6.
It is required for JogAmp developers to validate Android compatibility
by an Android crosscompilation build.
Current GlueGen code utilizes some minor Java 1.6 features
which could be replaced, however it's not desired at this point
since we have no mode hard Java 1.5 constraints.
Notes:
- On OS X 10.5.8, only the 64bit version of Java6 is available
and hence the only supported one on Leopard.
+++
Pushing determination of host (compiletime) and target (runtime) Java version
to 'jogamp-env.xml'.
jogamp-env.xml uses:
env: SOURCE_LEVEL -> propery: target.sourcelevel def.: ${ant.java.version} >=1.6 (!)
env: TARGET_LEVEL -> propery: target.targetlevel def.: ${ant.java.version} >=1.6 (!)
env: TARGET_RT_JAR -> propery: target.rt.jar def.: ${java.home}/lib/rt.jar
Either all above values are set, or none at all (default),
otherwise a build error is being thrown.
Further more we have the compiletime properties:
host.sourcelevel def.: ${ant.java.version} >= 1.6 (!)
host.targetlevel def.: ${ant.java.version} >= 1.6 (!)
host.rt.jar def.: ${java.home}/lib/rt.jar
+++
- 'javac.memorymax' defaults to 1024m now.
Diffstat (limited to 'make/jogamp-androidtasks.xml')
| -rw-r--r-- | make/jogamp-androidtasks.xml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml index affd277..3f7b3f0 100644 --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -56,8 +56,6 @@ <var name="m.aapt.keystore.file" unset="true"/> <var name="m.aapt.java.encoding" unset="true"/> - <var name="m.aapt.java.target" unset="true"/> - <var name="m.aapt.java.source" unset="true"/> <property name="m.aapt.build.apk" value="@{jarbuilddir}/@{jarbasename}.apk.d" /> <property name="m.aapt.dex.file" location="${m.aapt.build.apk}/image/classes.dex" /> @@ -66,8 +64,6 @@ <property name="m.aapt.release.file.name" value="@{jarbuilddir}/@{jarbasename}.apk" /> <property name="m.aapt.java.encoding" value="UTF-8" /> - <property name="m.aapt.java.target" value="1.5" /> - <property name="m.aapt.java.source" value="1.5" /> <condition property="m.aapt.keystore.file" value="@{keystore.file}" else="${m.aapt.build.apk}/debug.keystore"> <available file="@{keystore.file}"/> @@ -113,7 +109,9 @@ <echo>aapt.signed @{jarbasename}: compiling R.java...</echo> <javac encoding="${m.aapt.java.encoding}" - source="${m.aapt.java.source}" target="${m.aapt.java.target}" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" debug="true" extdirs="" destdir="${m.aapt.build.apk}/image/lib/classes" verbose="true"> |