diff options
| author | Sven Gothel <[email protected]> | 2012-06-15 04:06:19 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-06-15 04:06:19 +0200 |
| commit | 86c1df6fdca183454ff544857f4236b646c4730d (patch) | |
| tree | e35d0446ae5c228d7cb2685d89159ff12c7c48a1 /make/jogamp-androidtasks.xml | |
| parent | b3c9951006f9bd863244f1db3d54ac7866d66f0a (diff) | |
Fix Bug 583 (2): Remove Android compile-time dependencies and exclude Android specific classes for non Android platforms
Ensure same Java JAR content regardless of build target (fix).
Separate Android compilation results to gluegen-rt-android.jar,
avoiding generating different content of gluegen-rt.jar w/ non android builds.
aapt.signed: @{android.abi} argument is 'generic' by default.
Adding ${android.abi} to APK target name (gluegen-rt-android-armeabi-v7a.apk)
if not generic.
Diffstat (limited to 'make/jogamp-androidtasks.xml')
| -rw-r--r-- | make/jogamp-androidtasks.xml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml index f37e42c..3e40fe1 100644 --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -44,12 +44,13 @@ <!-- attribute name="jarclasspathrefid" default="/non.existing.jarclasspathrefid"/--> <attribute name="version.code" /> <attribute name="version.name" /> - <attribute name="android.abi" /> + <attribute name="android.abi" default="generic" /> <attribute name="keystore.file" default="/non.existing.user.keystore.file" /> <attribute name="keystore.alias" default="debug" /> <attribute name="keystore.storepass" default="jogamp" /> <attribute name="keystore.keypass" default="jogamp" /> <sequential> + <var name="m.aapt.android.abi.extstr" unset="true"/> <var name="m.aapt.build.apk" unset="true"/> <var name="m.aapt.dex.file" unset="true"/> <var name="m.aapt.unsigned.package.file.name" unset="true"/> @@ -59,11 +60,17 @@ <var name="m.aapt.java.encoding" unset="true"/> - <property name="m.aapt.build.apk" value="@{jarbuilddir}/@{jarbasename}.apk.d" /> + <condition property="m.aapt.android.abi.extstr" value="-@{android.abi}" else=""> + <not> + <equals arg1="@{android.abi}" arg2="generic" casesensitive="true" /> + </not> + </condition> + + <property name="m.aapt.build.apk" value="@{jarbuilddir}/@{jarbasename}${m.aapt.android.abi.extstr}.apk.d" /> <property name="m.aapt.dex.file" location="${m.aapt.build.apk}/image/classes.dex" /> - <property name="m.aapt.unsigned.package.file.name" value="@{jarbuilddir}/@{jarbasename}-unsigned.apk" /> - <property name="m.aapt.signed.file.name" value="${m.aapt.build.apk}/@{jarbasename}-signed-raw.apk" /> - <property name="m.aapt.release.file.name" value="@{jarbuilddir}/@{jarbasename}.apk" /> + <property name="m.aapt.unsigned.package.file.name" value="@{jarbuilddir}/@{jarbasename}${m.aapt.android.abi.extstr}-unsigned.apk" /> + <property name="m.aapt.signed.file.name" value="${m.aapt.build.apk}/@{jarbasename}${m.aapt.android.abi.extstr}-signed-raw.apk" /> + <property name="m.aapt.release.file.name" value="@{jarbuilddir}/@{jarbasename}${m.aapt.android.abi.extstr}.apk" /> <property name="m.aapt.java.encoding" value="UTF-8" /> |