summaryrefslogtreecommitdiffstats
path: root/make/build-test.xml
diff options
context:
space:
mode:
Diffstat (limited to 'make/build-test.xml')
-rw-r--r--make/build-test.xml15
1 files changed, 9 insertions, 6 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index 51dc554..f00e7b2 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -8,6 +8,7 @@
<import file="gluegen-cpptasks.xml" />
<import file="jogamp-archivetasks.xml" />
+ <import file="jogamp-androidtasks.xml" />
<import file="jogamp-env.xml" />
<condition property="rootrel.build" value="build">
@@ -130,12 +131,14 @@
</target>
<target name="android.package" depends="java.build,native.build" if="isAndroid">
- <delete file="${gluegen-test.apk}" includeEmptyDirs="true" quiet="true" failonerror="false" />
- <exec dir="." executable="dx" logError="true" failonerror="true" failifexecutionfails="true">
- <arg line="--dex"/>
- <arg line="--output=${gluegen-test.apk}"/>
- <arg line="${gluegen-test.jar}"/>
- </exec>
+ <aapt.signed
+ jarbuilddir="${build_t}"
+ jarbasename="gluegen-test"
+ nativebuilddir="${build_t.lib}"
+ nativebasename="test"
+ androidmanifest.path="lib/android/AndroidManifest.xml"
+ version.code="${gluegen_int_version}"
+ version.name="${gluegen.version.plus}" />
</target>
<target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler">