diff options
| author | Sven Gothel <[email protected]> | 2011-07-28 15:27:17 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-07-28 15:27:17 +0200 |
| commit | dcaa3cb5cabfa11ae88fad266b54a1690148edf9 (patch) | |
| tree | 52bdb20815315a7eda69539c3e01806c15457893 /make/jogamp-androidtasks.xml | |
| parent | 02641c4d08853a1e0131336968f691fde8a30043 (diff) | |
Fix Android apk activity; Add apk VersionName; Add jar manifest to apk
- build:
- exclude android packages if !isAndroid
- aapt:
- Use individual AndroidManifest xml files
- optional: incl. our JAR manifest file to support detailed version info
- use def. GluegenVersionActivity
- APK VersionName: Retrieve and show
- package/extension names:
- gluegen.jar/apk: com.jogamp.gluegen
- gluegen-rt.jar/apk: com.jogamp.common
Diffstat (limited to 'make/jogamp-androidtasks.xml')
| -rw-r--r-- | make/jogamp-androidtasks.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml index d07d6bc..f5872f2 100644 --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -14,6 +14,7 @@ nativebuilddir="${gluegen.lib.dir}" // native library build location nativebasename="gluegen-rt" // native library base file name "*${nativebasename}*.${native.library.suffix}" androidmanifest.path="lib/android/AndroidManifest.xml" + jarmanifest.path="${build}/Manifest-rt.temp" // optional version.code="${gluegen_int_version}" version.name="${gluegen.version.plus}" @@ -34,6 +35,7 @@ <attribute name="nativebuilddir" /> <attribute name="nativebasename" /> <attribute name="androidmanifest.path" /> + <attribute name="jarmanifest.path" default="/non.existing.manifest.file"/> <attribute name="version.code" /> <attribute name="version.name" /> <attribute name="keystore.file" default="/non.existing.user.keystore.file" /> @@ -69,6 +71,8 @@ <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"/> <echo>aapt.signed @{jarbasename}: dex'ing</echo> <exec dir="." executable="dx" logError="true" failonerror="true" failifexecutionfails="true"> @@ -91,17 +95,12 @@ <!--arg line="-v"/--> <arg line="--debug-mode"/> <arg line="-f"/> - <!-- arg line="-j" /> - <arg value="@{jarbuilddir}/@{jarbasename}.jar"/--> - - <arg line="-M" /> - <arg value="@{androidmanifest.path}"/> <arg line="-S" /> <arg value="lib/android/res"/> <arg line="-A" /> - <arg value="${m.aapt.build.apk}/image/lib/assets"/> <!-- FIXME: Should assets be in out lib/android/assets ?? --> + <arg value="${m.aapt.build.apk}/image/lib/assets"/> <arg line="-I" /> <arg value="${env.ANDROID_SDK_HOME}/platforms/android-${env.ANDROID_SDK_VERSION}/android.jar"/> |