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/build-jogl.xml | |
| 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/build-jogl.xml')
| -rw-r--r-- | make/build-jogl.xml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index f80efdfc7..0c7328c4a 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -194,20 +194,13 @@ <isset property="setup.noSWT"/> </condition> - <condition property="java.excludes.android" - value="${java.part.android}"> - <not> - <isset property="isAndroid"/> - </not> - </condition> - <property name="java.excludes.javadoc.packagenames" value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/> <property name="java.excludes.fixme" value="jogamp/opengl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" /> - <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.awt} ${java.excludes.swt} ${java.excludes.android}" /> + <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.awt} ${java.excludes.swt}" /> <echo message="java.excludes.all: ${java.excludes.all}" /> </target> @@ -1043,10 +1036,10 @@ </javac> </target> - <target name="java.compile.secondpass.javase" unless="isAndroid"> + <target name="java.compile.secondpass.javase"> <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. --> <javac destdir="${classes}" - excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}" + excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.part.android}" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" @@ -1064,7 +1057,7 @@ <target name="java.compile.secondpass.android" if="isAndroid"> <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. --> <javac destdir="${classes}" - excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}" + includes="${java.part.android}" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" @@ -1073,7 +1066,7 @@ target="${target.targetlevel}" bootclasspath="${target.rt.jar}" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> - <classpath refid="android_nativewindow_gluegen.classpath"/> + <classpath refid="nativewindow_gluegen_android.classpath"/> <src path="${src.java}" /> <src path="${src.generated.java}" /> </javac> @@ -1085,7 +1078,7 @@ <target name="java.compile.thirdpass.javase"> <!-- Perform the third pass Java compile; everything including fixed function emulation. --> <javac destdir="${classes}" - excludes="${java.excludes.all}" + excludes="${java.excludes.all},${java.part.android}" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" |