diff options
| -rw-r--r-- | make/jogamp-androidtasks.xml | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml index 0b2abac..25eff11 100644 --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -29,6 +29,7 @@ we strongly discourage users to actually use it in an automated environment! Pls sign your apps manually. --> + <macrodef name="aapt.signed"> <attribute name="jarbuilddir" /> <attribute name="jarbasename" /> @@ -36,6 +37,7 @@ <attribute name="nativebasename" /> <attribute name="androidmanifest.path" /> <attribute name="jarmanifest.path" default="/non.existing.manifest.file"/> + <attribute name="jarclasspathrefid" default="android.classpath"/> <attribute name="version.code" /> <attribute name="version.name" /> <attribute name="keystore.file" default="/non.existing.user.keystore.file" /> @@ -50,12 +52,19 @@ <var name="m.aapt.release.file.name" unset="true"/> <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" /> <property name="m.aapt.resource.package.file.name" value="${m.aapt.build.apk}/@{jarbasename}.ap_" /> <property name="m.aapt.signed.file.name" value="${m.aapt.build.apk}/@{jarbasename}-sign.ap_" /> <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" /> <path id="android.classpath"> <pathelement location="${antlr.jar}" /> @@ -79,15 +88,11 @@ <include name="*@{nativebasename}*.${native.library.suffix}" /> </fileset> </copy> + <copy file="@{androidmanifest.path}" tofile="${m.aapt.build.apk}/image/AndroidManifest.xml"/> <copy file="@{jarmanifest.path}" failonerror="false" tofile="${m.aapt.build.apk}/image/META-INF/MANIFEST.MF"/> - - <property name="djava.encoding" value="UTF-8" /> - <property name="djava.target" value="1.5" /> - <property name="djava.source" value="1.5" /> - - <echo>Generating R.java / Manifest.java from the resources...</echo> + <echo>aapt.signed @{jarbasename}: generating Android R.java from the resources...</echo> <exec dir="." executable="aapt" logError="true" failonerror="true" failifexecutionfails="true"> <arg line="package"/> <arg line="-v"/> @@ -104,13 +109,13 @@ </exec> <echo>aapt.signed @{jarbasename}: compiling R.java...</echo> - <javac encoding="${djava.encoding}" - source="${djava.source}" target="${djava.target}" + <javac encoding="${m.aapt.java.encoding}" + source="${m.aapt.java.source}" target="${m.aapt.java.target}" debug="true" extdirs="" destdir="${m.aapt.build.apk}/image/lib/classes" verbose="true"> <src path="${m.aapt.build.apk}/image/lib/src" /> - <classpath refid="android.classpath" /> + <classpath refid="@{jarclasspathrefid}" /> </javac> <echo>aapt.signed @{jarbasename}: dex'ing</echo> |