diff options
| author | Sven Gothel <[email protected]> | 2012-10-04 03:23:30 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-10-04 03:23:30 +0200 |
| commit | 55b4552aef7882c358d545d020d6f12c958ed8ed (patch) | |
| tree | 2401f06143979f94dce9231f9db8ae45145fc7d6 /make/gluegen-properties.xml | |
| parent | 5ac7a618808ca7964c74789e28f0a1e9b6e9c14e (diff) | |
Fix Bug 624 - Compile and generate android JAR files (gluegen-rt-android.jar) if android SDK JAR files are available.
Diffstat (limited to 'make/gluegen-properties.xml')
| -rwxr-xr-x | make/gluegen-properties.xml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml index 60721eb..7aab7c5 100755 --- a/make/gluegen-properties.xml +++ b/make/gluegen-properties.xml @@ -54,7 +54,23 @@ <property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init --> <property name="android-min.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" /> <property name="android-015.jar" value="${gluegen.root}/make/lib/android-sdk/15/android.jar" /> - <property name="android.jar" value="${android-015.jar}" /> + <property name="android.jar" value="${android-015.jar}" /> + <condition property="android-jars.available"> + <and> + <available file="${android-min.jar}"/> + <available file="${android.jar}"/> + </and> + </condition> + <fail message="isAndroid set, but android jar files n/a: ${android-min.jar}, ${android.jar}"> + <condition> + <and> + <isset property="isAndroid"/> + <not> + <isset property="android-jars.available"/> + </not> + </and> + </condition> + </fail> <property name="android.keystore.file" value="/non.existing.user.keystore.file"/> <!-- default - maybe overriden by the gluegen.user.properties.file --> <property name="android.keystore.alias" value="debug"/> |