diff options
| author | Sven Gothel <[email protected]> | 2019-12-26 04:26:32 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-12-26 04:26:32 +0100 |
| commit | 1390bc236de531646aaa4525a17de1a533b1fa06 (patch) | |
| tree | 8766f44afe2adc5883f04be138dc08a9de80f219 /make/build-test.xml | |
| parent | faa37334e2912e02cb58e738570a127cc6402b37 (diff) | |
Bug 1417 - Android: Use d8 for dex'ing w/ implicit Java8 desugaring (macro: aapt.signed)
The new SDK d8 dex'ing tool performs Java8 desugaring, hence allows using Java8 code style.
We use d8 instead of dx in the 'aapt.signed' macro of 'jogamp-androidtasks.xml'.
For the proper desugaring, we pass 'android-min.jar and 'target.rt.jar' Android and Java8
system runtime jar-files to d8's classpath.
Macro 'aapt.signed' also receives the new optional element 'd8-classpaths'
to allows caller to pass further required jar-files to the d8 classpath.
See build-test.xml.
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 5d7d75d..a83333d 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -209,8 +209,14 @@ androidmanifest.path="resources/android/AndroidManifest-Test.xml" androidresources.path="resources/android/res" version.code="${jogamp.version.int}" - version.name="${jogamp.version}" - /> + version.name="${jogamp.version}"> + <d8-classpaths> + <arg line="--classpath ${junit.jar}"/> + <arg line="--classpath ${semver.jar}"/> + <arg line="--classpath ${gluegen.jar}"/> + <arg line="--classpath ${gluegen-test-util.jar}"/> + </d8-classpaths> + </aapt.signed> </target> <target name="c.configure" depends="gluegen.cpptasks.detect.os,gluegen.cpptasks.setup.compiler"> |