diff options
author | Sven Gothel <[email protected]> | 2023-01-20 05:36:22 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2023-01-20 05:36:22 +0100 |
commit | 1645b44851550989736b1ec93af46d5892ec56e1 (patch) | |
tree | 510b479c4cd63f4438d18a9aefdf0ae3e8a62edf /make/build-nativewindow.xml | |
parent | 05f26f2638c2ac1cc8eab7a8b1c951020df03dd8 (diff) |
Isolate SWT from core nativewindow; Android apk shall only include core nativewindow and the android specific jogl parts (make d8 'dex'ing' happy)
Diffstat (limited to 'make/build-nativewindow.xml')
-rw-r--r-- | make/build-nativewindow.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 5b86a639c..e682bc68e 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -69,6 +69,9 @@ <property name="java.part.core" value="com/jogamp/nativewindow/* com/jogamp/nativewindow/util/* com/jogamp/nativewindow/egl/* com/jogamp/nativewindow/swt/** com/jogamp/nativewindow/javafx/** jogamp/nativewindow/*"/> + <property name="java.part.swt" + value="com/jogamp/nativewindow/swt/*"/> + <property name="java.part.awt" value="com/jogamp/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/> @@ -1055,6 +1058,13 @@ </copy> </target> + <target name="build-jars-swt" depends="setup-manifestfile"> + <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-swt.jar}" filesonly="true"> + <fileset dir="${classes}" + includes="${java.part.swt}" /> + </jar> + </target> + <target name="build-jars-awt" depends="setup-manifestfile" unless="setup.noAWT"> <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow-awt.jar}" filesonly="true"> <fileset dir="${classes}" @@ -1098,11 +1108,11 @@ </jar> </target> - <target name="build-jars-javase" depends="setup-manifestfile,build-jars-awt,build-jars-drm,build-jars-x11,build-jars-windows,build-jars-macosx,build-jars-ios"> + <target name="build-jars-javase" depends="setup-manifestfile,build-jars-swt,build-jars-awt,build-jars-drm,build-jars-x11,build-jars-windows,build-jars-macosx,build-jars-ios"> <jar manifest="${build.nativewindow}/manifest.mf" destfile="${nativewindow.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}" - excludes="${java.part.awt} ${java.part.drm} ${java.part.x11} ${java.part.windows}"/> + excludes="${java.part.swt} ${java.part.awt} ${java.part.drm} ${java.part.x11} ${java.part.windows}"/> </jar> <native.tag.jar objdir="${obj.nativewindow}" nativejarfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" |