diff options
| author | Sven Gothel <[email protected]> | 2011-07-28 04:24:54 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-07-28 04:24:54 +0200 |
| commit | 2d672b1c5f237ccb911b9106308c0dc1977530b0 (patch) | |
| tree | 3e7f66d032c7aab0dfadb663a2fb60381bb6eece /make/build-test.xml | |
| parent | 445521018f49305cb3c09a4f2dcf0e9be8bc5a46 (diff) | |
Fix android build/unit-test ; Generalize aapt packaging (macro) ; Use jogamp icons
make/scripts/make.gluegen.all.android-armv7-cross.sh
- make Rami and me happy :)
- 3 default locations plus recognize user provided android toolkit path
- fixes using ant targets as arguments
make/jogamp-androidtasks.xml
- macro aapt.signed: create signed apk file from jar
- incl. adding native libraries
- see macro doc.
adding generic jogamp icons/images
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 15 |
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"> |