From 1645b44851550989736b1ec93af46d5892ec56e1 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 20 Jan 2023 05:36:22 +0100
Subject: Isolate SWT from core nativewindow; Android apk shall only include
 core nativewindow and the android specific jogl parts (make d8 'dex'ing'
 happy)

---
 make/build.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'make/build.xml')

diff --git a/make/build.xml b/make/build.xml
index 8991b4208..70414f903 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -138,7 +138,7 @@
         <jar manifest="${build}/manifest-all.mf" destfile="${jogl-all-android.jar}" filesonly="true" excludes="META-INF/*">
             <archives>
                 <zips>
-                    <path refid="nativewindow_core_atoms.classpath"/>
+                    <path refid="nativewindow_android_atoms.classpath"/>
                     <path refid="jogl_all-android_atoms.classpath"/>
                     <path refid="newt_all-android_atoms.classpath"/>
                 </zips>
@@ -216,9 +216,7 @@
           <d8-classpaths>
               <arg line="--classpath ${gluegen-rt-android.jar}"/> 
               <arg line="--classpath ${joal.jar}"/> 
-              <arg line="--classpath ${jogl-all.jar}"/> 
               <arg line="--classpath ${jogl-all-android.jar}"/> 
-              <arg line="--classpath ${swt.jar}"/> 
               <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-base-11.jar"/>
               <arg line="--classpath ${project.root}/make/lib/openjfx/11/javafx-graphics-11.jar"/>
           </d8-classpaths>
-- 
cgit v1.2.3