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.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.xml')
| -rw-r--r-- | make/build.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index 5f85f9a6e..9258df0e9 100644 --- a/make/build.xml +++ b/make/build.xml @@ -372,7 +372,7 @@ source="${target.sourcelevel}" maxmemory="${javac.memorymax}" bottom="${javadoc.bottom}" > - <classpath refid="jogl_all.classpath"/> + <classpath refid="jogl_doc.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> <link offline="false" href="${gluegen.link}" /> <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/> @@ -394,7 +394,7 @@ source="${target.sourcelevel}" maxmemory="${javac.memorymax}" bottom="${javadoc.bottom}" > - <classpath refid="jogl_all.classpath"/> + <classpath refid="jogl_doc.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> <link offline="false" href="${gluegen.link}" /> <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/> @@ -417,7 +417,7 @@ source="${target.sourcelevel}" maxmemory="${javac.memorymax}" bottom="${javadoc.bottom}" > - <classpath refid="jogl_all.classpath"/> + <classpath refid="jogl_doc.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> <link offline="false" href="${gluegen.link}" /> <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/> @@ -439,7 +439,7 @@ source="${target.sourcelevel}" maxmemory="${javac.memorymax}" bottom="${javadoc.bottom}" > - <classpath refid="jogl_all.classpath"/> + <classpath refid="jogl_doc.classpath"/> <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" /> <link offline="false" href="${gluegen.link}" /> <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/> |