Footprint Stats ; Fix Bug 624 - Compile and generate android JAR files (jogl-all-android.jar, jogl-test-android.jar) if android SDK JAR files are available. ; Split up atomic jogl-util.jar

Compile and generate android JAR files (jogl-all-android.jar, jogl-test-android.jar) if android SDK JAR files are available.
  - See gluegen commit 55b4552aef7882c358d545d020d6f12c958ed8ed

Also split up atomic jogl-util.jar
  - jogl-util.jar -> jogl-util.jar + jogl-util-graph.jar

Footprint Stats:

  This demonstrates small footprint of a minimum configuration,
  all numbers in kilobytes (du -ksc).
  NOTE the min size of ~ 1MB!

JOGL ALL
  220 kB  gluegen-rt.jar
 5180 kB  jogl-all.jar
    4 kB  libgluegen-rt.so.gz
    4 kB  libnativewindow_awt.so.gz
   12 kB  libnativewindow_x11.so.gz
  100 kB  libjogl_desktop.so.gz
   20 kB  libnewt.so.gz
 5540 kB  total

JOGL Min X11 Min egl es1 es2
  220 kB  gluegen-rt.jar
  296 kB  atomic/jogl-core.jar
  156 kB  atomic/jogl-glmobile.jar
  284 kB  atomic/jogl-util.jar
   76 kB  atomic/nativewindow-core.jar
  120 kB  atomic/newt-core.jar
   28 kB  atomic/nativewindow-os-x11.jar
   28 kB  atomic/newt-driver-x11.jar
    4 kB  libgluegen-rt.so.gz
   48 kB  libjogl_mobile.so.gz
   12 kB  libnativewindow_x11.so.gz
   20 kB  libnewt.so.gz
 1292 kB  total

JOGL Android - mobile egl es1 es2
  224 kB  gluegen-rt-android.jar
 3020 kB  jogl-all-android.jar
    4 kB  libgluegen-rt.so.gz
   48 kB  libjogl_mobile.so.gz
 3296 kB  total

JOGL Min Android/Mobile Min egl es1 es2
  224 kB  gluegen-rt-android.jar
  296 kB  atomic/jogl-core.jar
  156 kB  atomic/jogl-glmobile.jar
    8 kB  atomic/jogl-os-android.jar
  284 kB  atomic/jogl-util.jar
   76 kB  atomic/nativewindow-core.jar
  120 kB  atomic/newt-core.jar
   28 kB  atomic/newt-driver-android.jar
    4 kB  libgluegen-rt.so.gz
   48 kB  libjogl_mobile.so.gz
 1244 kB  total

1 files changed, 9 insertions, 5 deletions

diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index a72d6c77c..85abf10b7 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -1054,7 +1054,7 @@
         </javac>
     </target>
 
-    <target name="java.compile.secondpass.android" if="isAndroid">
+    <target name="java.compile.secondpass.android" if="android-jars.available">
         <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
         <javac destdir="${classes}"
                includes="${java.part.android}"
@@ -1550,7 +1550,7 @@
             <srcfileset dir="${src.java}"
                      includes="${java.part.nonjava}"/>
             <targetfileset dir="."
-                     includes="${jogl-util.jar} ${jogl-util-fixedfuncemu.jar}" />
+                     includes="${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-fixedfuncemu.jar}" />
         </dependset>
     </target>
     <target name="build-jars" depends="build-jars-dependset,build-jars-javase" />
@@ -1581,7 +1581,7 @@
         </jar>
     </target>
 
-    <target name="build-jars-android" depends="setup-manifestfile" if="isAndroid">
+    <target name="build-jars-android" depends="setup-manifestfile" if="android-jars.available">
         <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-os-android.jar}" filesonly="true">
             <fileset dir="${classes}" includes="${java.part.android}"/>
         </jar>
@@ -1662,10 +1662,14 @@
         </jar>
         <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util.jar}" filesonly="true">
             <fileset dir="${classes}"
-                     includes="${java.part.util} ${java.part.util.glsl} ${java.part.util.graph}"
-                     excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu}"/>
+                     includes="${java.part.util} ${java.part.util.glsl}"
+                     excludes="${java.part.util.awt} ${java.part.util.gldesktop} ${java.part.util.fixedfuncemu} ${java.part.util.graph}"/>
             <fileset dir="resources/assets" includes="jogl/util/**" />
         </jar>
+        <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-graph.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="${java.part.util.graph}"/>
+        </jar>
         <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-util-fixedfuncemu.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.util.fixedfuncemu}"/>