diff options
| author | Sven Gothel <[email protected]> | 2011-08-02 12:05:45 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-08-02 12:05:45 +0200 |
| commit | e959f955901492f7d61abaa05da10c993052652b (patch) | |
| tree | 1df10becd7e24fbed6d90bea08aaf11cd783a843 /make/gluegen-properties.xml | |
| parent | e813dbe55f2a56457f28d1efd82762ce412b1f86 (diff) | |
Android: Drop android.jar ; Simplify 'aapt.signed' ; Move our android resources -> make/resources
Drop android.jar
- version 8 and 9
- license: apache v2 (NOTICE.txt included)
- allows compilation using Android API on all platforms
Simplify 'aapt.signed'
- removed 'jarclasspathrefid', seems to be not needed
(commented out)
Move our android resources make/lib/android -> make/resources/android
- make/lib is for 3rd party stuff only
Diffstat (limited to 'make/gluegen-properties.xml')
| -rwxr-xr-x | make/gluegen-properties.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml index 95f58f5..5ccc119 100755 --- a/make/gluegen-properties.xml +++ b/make/gluegen-properties.xml @@ -43,7 +43,11 @@ <property name="junit.jar" value="${gluegen.root}/make/lib/junit.jar" /> <property name="ant.jar" value="${ant.home}/lib/ant.jar" /> <property name="ant-junit.jar" value="${ant.home}/lib/ant-junit.jar" /> + + <property name="android.version" value="9" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init --> + <property name="android.jar" value="${gluegen.root}/make/lib/android-sdk/${android.version}/android.jar" /> <property name="ant-junit-all.apk" value="${gluegen.root}/make/lib/ant-junit-all.apk" /> + <condition property="win32.c.compiler" value="mingw64"> <and> <os family="windows" /> |