diff options
| author | Sven Gothel <[email protected]> | 2019-12-26 18:24:28 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-12-26 18:24:28 +0100 |
| commit | 22b41b9a232527d8c2b2a2b03e03005273529df7 (patch) | |
| tree | 1d5cd2c19c56dbc0d6a96cdfba61c269cf19781b /make/build-test.xml | |
| parent | 855fc43060fe788ce32b2daa396f6fe236c31ba8 (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-test.xml')
| -rw-r--r-- | make/build-test.xml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index a4756300..fc2938ad 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -171,7 +171,14 @@ androidresources.path="resources/android/res-test" jarmanifest.path="${build.test}/manifest-test-android.mf" 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}"/> + <arg line="--classpath ${jocl.jar}"/> + <arg line="--classpath ${junit.jar}"/> + </d8-classpaths> + </aapt.signed> </target> <target name="test.compile" depends="declare.common" unless="test.compile.skip"> |