Isolate SWT from core nativewindow; Android apk shall only include core nativewindow and the android specific jogl parts (make d8 'dex'ing' happy)

4 files changed, 19 insertions, 7 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>
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"
diff --git a/make/build-test.xml b/make/build-test.xml
index 9044d5887..a4d8e401d 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -238,7 +238,6 @@
           <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 ${gluegen-test-util.jar}"/> 
               <arg line="--classpath ${junit.jar}"/> 
@@ -246,7 +245,6 @@
               <arg line="--classpath ${ant-junit.jar}"/> 
               <arg line="--classpath ${ant-junit4.jar}"/> 
               <arg line="--classpath ${semver.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>
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>