summaryrefslogtreecommitdiffstats
path: root/make/gluegen-properties.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-12-10 06:32:34 +0100
committerSven Gothel <[email protected]>2019-12-10 06:32:34 +0100
commit74e5bbe097a07d1275a2d6452d1e2336a8d5c44a (patch)
tree234817e7d3900956abf2355cb7846e53d25a4f63 /make/gluegen-properties.xml
parent5736716ed0598c97273583717ffb9d22a60ca7a4 (diff)
Bug 1417 - Android: Support building using current SDK and NDK v20 as of 2019-12-10 (GlueGen w/ android-aarch64 patched)
Default Platform: Android 7.0 Nougat, API level 24 supports Java 1.8 Reworked gluegen/make/scripts/setenv-android-tools.sh, following canonical environment variables and sets all required variables for cross-compilation. See file's comments! ant files: - android.version -> android.api.level (default 24) - android.jar defaults to ${gluegen.root}/make/lib/android-sdk/24/android.jar (provided)
Diffstat (limited to 'make/gluegen-properties.xml')
-rwxr-xr-xmake/gluegen-properties.xml7
1 files changed, 3 insertions, 4 deletions
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 54fbc8c..2f061fc 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -57,10 +57,9 @@
<property name="ant-junit4.jar" value="${ant.home}/lib/ant-junit4.jar" />
<property name="semver.jar" value="${gluegen.root}/make/lib/semantic-versioning/semver.jar" />
- <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.api.level" value="24" /> <!-- default - if not set by jogamp-env.xml:jogamp.env.init -->
+ <property name="android-min.jar" value="${gluegen.root}/make/lib/android-sdk/${android.api.level}/android.jar" />
+ <property name="android.jar" value="${android-min.jar}" />
<condition property="android-jars.available">
<and>
<available file="${android-min.jar}"/>