summaryrefslogtreecommitdiffstats
path: root/make/jogamp-androidtasks.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/jogamp-androidtasks.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/jogamp-androidtasks.xml')
-rw-r--r--make/jogamp-androidtasks.xml10
1 files changed, 1 insertions, 9 deletions
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml
index 82679c4..172da7b 100644
--- a/make/jogamp-androidtasks.xml
+++ b/make/jogamp-androidtasks.xml
@@ -180,14 +180,6 @@
<arg line="${m.aapt.build.apk}/temp/classes"/>
</exec>
- <path id="android.antlibs">
- <pathelement path="${env.ANDROID_HOME}/tools/lib/anttasks.jar" />
- <pathelement path="${env.ANDROID_HOME}/tools/lib/sdklib.jar" />
- <pathelement path="${env.ANDROID_HOME}/tools/lib/androidprefs.jar" />
- <pathelement path="${env.ANDROID_HOME}/tools/lib/apkbuilder.jar" />
- <pathelement path="${env.ANDROID_HOME}/tools/lib/jarutils.jar" />
- </path>
-
<echo>aapt.signed ${m.aapt.apkbasename}: packaging</echo>
<exec dir="." executable="aapt" logError="true" failonerror="true" failifexecutionfails="true">
<arg line="package"/>
@@ -282,7 +274,7 @@
</exec>
<echo>aapt.signed ${m.aapt.apkbasename}: zip aligning</echo>
- <exec dir="." executable="${env.ANDROID_HOME}/build-tools/${env.ANDROID_BUILD_TOOLS_VERSION}/zipalign" failonerror="true">
+ <exec dir="." executable="zipalign" failonerror="true">
<arg line="-v" />
<arg value="-f" />
<arg value="4" />