summaryrefslogtreecommitdiffstats
path: root/make/build-common.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-01-20 05:36:22 +0100
committerSven Gothel <[email protected]>2023-01-20 05:36:22 +0100
commit1645b44851550989736b1ec93af46d5892ec56e1 (patch)
tree510b479c4cd63f4438d18a9aefdf0ae3e8a62edf /make/build-common.xml
parent05f26f2638c2ac1cc8eab7a8b1c951020df03dd8 (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-common.xml')
-rw-r--r--make/build-common.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/make/build-common.xml b/make/build-common.xml
index 422eb05af..78564d1ff 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -296,6 +296,7 @@
<!-- Atomic JavaSE JARS -->
<property name="nativewindow.jar" value="${build.nativewindow}/nativewindow.jar" />
+ <property name="nativewindow-swt.jar" value="${build.nativewindow}/nativewindow-swt.jar" />
<property name="nativewindow-awt.jar" value="${build.nativewindow}/nativewindow-awt.jar" />
<property name="nativewindow-os-drm.jar" value="${build.nativewindow}/nativewindow-os-drm.jar" />
<property name="nativewindow-os-x11.jar" value="${build.nativewindow}/nativewindow-os-x11.jar" />
@@ -305,6 +306,7 @@
<path id="nativewindow_all_atoms.classpath">
<pathelement location="${nativewindow.jar}" />
+ <pathelement location="${nativewindow-swt.jar}" />
<pathelement location="${nativewindow-awt.jar}" />
<pathelement location="${nativewindow-os-drm.jar}" />
<pathelement location="${nativewindow-os-x11.jar}" />
@@ -314,12 +316,16 @@
</path>
<path id="nativewindow_all-noawt_atoms.classpath">
<pathelement location="${nativewindow.jar}" />
+ <pathelement location="${nativewindow-swt.jar}" />
<pathelement location="${nativewindow-os-drm.jar}" />
<pathelement location="${nativewindow-os-x11.jar}" />
<pathelement location="${nativewindow-os-win.jar}" />
<pathelement location="${nativewindow-os-osx.jar}" />
<pathelement location="${nativewindow-os-ios.jar}" />
</path>
+ <path id="nativewindow_android_atoms.classpath">
+ <pathelement location="${nativewindow.jar}" />
+ </path>
<path id="nativewindow_core_atoms.classpath">
<pathelement location="${nativewindow.jar}" />
</path>