aboutsummaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-12-26 18:24:28 +0100
committerSven Gothel <[email protected]>2019-12-26 18:24:28 +0100
commit22b41b9a232527d8c2b2a2b03e03005273529df7 (patch)
tree1d5cd2c19c56dbc0d6a96cdfba61c269cf19781b /make/build.xml
parent855fc43060fe788ce32b2daa396f6fe236c31ba8 (diff)
Bug 1417: Android: Adapt to GlueGen's 'aapt.signed' d8 usage and use manifest SDK API [min=21, target=28]
Also fix all make/scripts using Java11 as 'host compiler' and Java8 as target-rt-jar, as well as adapt to GlueGen's new Android 'setenv-android-tools.sh' for new SDK/NDK as of 2019-12-10.
Diffstat (limited to 'make/build.xml')
-rw-r--r--make/build.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml
index 17ec8e70..bb46cbf5 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -642,7 +642,12 @@
androidresources.path="resources/android/res-jocl"
jarmanifest.path="${build}/tempversion"
version.code="${jogamp.version.int}"
- version.name="${jogamp.version}" />
+ version.name="${jogamp.version}">
+ <d8-classpaths>
+ <arg line="--classpath ${gluegen-rt-android.jar}"/>
+ <arg line="--classpath ${jogl-all.jar}"/>
+ </d8-classpaths>
+ </aapt.signed>
</target>
<!-- ================================================================== -->