diff options
| author | Sven Gothel <[email protected]> | 2019-12-10 06:32:34 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-12-10 06:32:34 +0100 |
| commit | 74e5bbe097a07d1275a2d6452d1e2336a8d5c44a (patch) | |
| tree | 234817e7d3900956abf2355cb7846e53d25a4f63 /make/jogamp-env.xml | |
| parent | 5736716ed0598c97273583717ffb9d22a60ca7a4 (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-env.xml')
| -rwxr-xr-x | make/jogamp-env.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml index 070c702..332554e 100755 --- a/make/jogamp-env.xml +++ b/make/jogamp-env.xml @@ -11,7 +11,7 @@ Official production builds are performed _on_ OpenJDK 11 and a Java JDK 11 or greater is required! - Android 7 API level 24 supports Java 1.8, + Android 7.0 Nougat, API level 24 supports Java 1.8, see https://developer.android.com/studio/write/java8-support Target Java 8 baseline is chosen today, June 2019, @@ -142,9 +142,9 @@ </not> </condition> - <condition property="android.version" value="${env.ANDROID_VERSION}" else="24"> + <condition property="android.api.level" value="${env.ANDROID_API_LEVEL}" else="24"> <not> - <equals arg1="${env.ANDROID_VERSION}" arg2="$${env.ANDROID_VERSION}" casesensitive="true" /> + <equals arg1="${env.ANDROID_API_LEVEL}" arg2="$${env.ANDROID_API_LEVEL}" casesensitive="true" /> </not> </condition> @@ -237,7 +237,7 @@ <echo message="build.archiveon ${build.archiveon}"/> <echo message="build.node.name ${build.node.name}"/> - <echo message="android.version ${android.version}"/> + <echo message="android.api.level ${android.api.level}"/> <echo message="junit.run.arg0 ${junit.run.arg0}"/> <echo message="junit.run.arg1 ${junit.run.arg1}"/> |