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

7 files changed, 42 insertions, 19 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 2cb776e74..a718ae09a 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -278,6 +278,7 @@
         <property name="jogl-glmobile.jar"              value="${build.jogl}/jogl-glmobile.jar" />
         <property name="jogl-glmobile-dbg.jar"          value="${build.jogl}/jogl-glmobile-dbg.jar" />
         <property name="jogl-util.jar"                  value="${build.jogl}/jogl-util.jar" />
+        <property name="jogl-util-graph.jar"            value="${build.jogl}/jogl-util-graph.jar" />
         <property name="jogl-glutess.jar"               value="${build.jogl}/jogl-glu-tess.jar" />
         <property name="jogl-glumipmap.jar"             value="${build.jogl}/jogl-glu-mipmap.jar" />
         <property name="jogl-util-fixedfuncemu.jar"     value="${build.jogl}/jogl-util-fixedfuncemu.jar" />
@@ -301,6 +302,7 @@
             <pathelement location="${jogl-glmobile.jar}" />
             <pathelement location="${jogl-glmobile-dbg.jar}" />
             <pathelement location="${jogl-util.jar}" />
+            <pathelement location="${jogl-util-graph.jar}" />
             <pathelement location="${jogl-glutess.jar}" />
             <pathelement location="${jogl-glumipmap.jar}" />
             <pathelement location="${jogl-util-fixedfuncemu.jar}" />
@@ -322,6 +324,7 @@
             <pathelement location="${jogl-glmobile.jar}" />
             <pathelement location="${jogl-glmobile-dbg.jar}" />
             <pathelement location="${jogl-util.jar}" />
+            <pathelement location="${jogl-util-graph.jar}" />
             <pathelement location="${jogl-glutess.jar}" />
             <pathelement location="${jogl-glumipmap.jar}" />
             <pathelement location="${jogl-util-fixedfuncemu.jar}" />
@@ -339,6 +342,7 @@
             <pathelement location="${jogl-glmobile.jar}" />
             <pathelement location="${jogl-glmobile-dbg.jar}" />
             <pathelement location="${jogl-util.jar}" />
+            <pathelement location="${jogl-util-graph.jar}" />
             <pathelement location="${jogl-glutess.jar}" />
             <pathelement location="${jogl-glumipmap.jar}" />
             <pathelement location="${jogl-util-fixedfuncemu.jar}" />
@@ -350,6 +354,7 @@
             <pathelement location="${jogl-glmobile.jar}" />
             <pathelement location="${jogl-glmobile-dbg.jar}" />
             <pathelement location="${jogl-util.jar}" />
+            <pathelement location="${jogl-util-graph.jar}" />
             <pathelement location="${jogl-glutess.jar}" />
             <pathelement location="${jogl-glumipmap.jar}" />
             <pathelement location="${jogl-util-fixedfuncemu.jar}" />
@@ -357,7 +362,7 @@
             <pathelement location="${jogl-omx.jar}" />
         </path>
         <!-- 
-            ${jogl-core.jar} ${jogl-glutess.jar} ${jogl-glumipmap.jar} ${jogl-glu-gldesktop.jar} ${jogl-os-x11.jar} ${jogl-os-win.jar} ${jogl-os-osx.jar} ${jogl-gldesktop.jar} ${jogl-gldesktop-dbg.jar} ${jogl-glmobile.jar} ${jogl-glmobile-dbg.jar} ${jogl-omx.jar} ${jogl-util.jar} ${jogl-util-gldesktop.jar} ${jogl-util-awt.jar} ${jogl-util-fixedfuncemu.jar} ${jogl-sdk.jar} -->
+            ${jogl-core.jar} ${jogl-glutess.jar} ${jogl-glumipmap.jar} ${jogl-glu-gldesktop.jar} ${jogl-os-x11.jar} ${jogl-os-win.jar} ${jogl-os-osx.jar} ${jogl-gldesktop.jar} ${jogl-gldesktop-dbg.jar} ${jogl-glmobile.jar} ${jogl-glmobile-dbg.jar} ${jogl-omx.jar} ${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-gldesktop.jar} ${jogl-util-awt.jar} ${jogl-util-fixedfuncemu.jar} ${jogl-sdk.jar} -->
 
         <property name="newt-core.jar"                  value="${build.newt}/newt-core.jar" />
         <property name="newt-ogl.jar"                   value="${build.newt}/newt-ogl.jar" />
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}"/>
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 1b59433d7..7b9a51863 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -237,7 +237,7 @@
         </javac>
     </target>
 
-    <target name="java.compile.android" if="isAndroid">
+    <target name="java.compile.android" if="android-jars.available">
         <javac destdir="${classes}"
                excludes="${java.excludes.all}"
                fork="yes"
@@ -814,7 +814,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.newt}/manifest.mf" destfile="${newt-driver-android.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.driver.android}"/>
diff --git a/make/build-test.xml b/make/build-test.xml
index d1175f3dd..3402b4d9d 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -96,7 +96,7 @@
         </jar>
     </target>
 
-    <target name="test.compile.android" if="isAndroid">
+    <target name="test.compile.android" if="android-jars.available">
         <!-- Perform the junit pass Java Android compile -->
         <javac destdir="${classes}"
                fork="yes"
@@ -129,7 +129,9 @@
                      includes="${java.part.test.all}"/>
             <fileset dir="resources/assets-test" includes="**" />
         </jar>
+    </target>
 
+    <target name="test.package.android" depends="test.compile.android" if="isAndroid">
         <aapt.signed 
             assetsdir="resources/assets-test"
             jarsrcdir="${src}/test"
@@ -171,7 +173,7 @@
             </fileset>
         </copy>
         <antcall target="test.compile.javase" inheritRefs="true" inheritAll="true"/>
-        <antcall target="test.compile.android" inheritRefs="true" inheritAll="true"/>
+        <antcall target="test.package.android" inheritRefs="true" inheritAll="true"/>
     </target>
 
     <target name="test.manual.run" depends="test.compile">
diff --git a/make/build.xml b/make/build.xml
index 23aa218b4..44adf805f 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -98,7 +98,7 @@
         </copy>
     </target>
 
-    <target name="one.jar.dir.android" depends="one.jar.dir.prep" if="isAndroid" unless="one.dir.skip">
+    <target name="one.jar.dir.android" depends="one.jar.dir.prep" if="android-jars.available" unless="one.dir.skip">
         <jar manifest="${build.jogl}/manifest.mf" destfile="${jogl-all-android.jar}" filesonly="true" excludes="META-INF/*">
             <archives>
                 <zips>
diff --git a/make/scripts/lstjars.sh b/make/scripts/lstjars.sh
index 82e378e20..5763e419f 100755
--- a/make/scripts/lstjars.sh
+++ b/make/scripts/lstjars.sh
@@ -1,5 +1,7 @@
 #! /bin/sh
 
+#set -x
+
 THISDIR=$(pwd)
 
 BUILDDIR=$1
@@ -21,7 +23,7 @@ fi
 function report() {
     #ls -1 -s --block-size=1024 $*
     #ls -1 -s --block-size=1024 $* | awk ' BEGIN { sum=0 ; } { sum=sum+$1; } END { printf("%d Total\n", sum); }'
-    du -ksc $*
+    du -ksc $* | awk ' { printf("%5d kB  %s\n", $1, $2); } '
 }
 
 OSS=x11
@@ -35,15 +37,23 @@ function listdeployment() {
     echo
 
     echo JOGL ALL
-    report gluegen-rt.$JAR_SUFFIX jogl.all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_awt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz
+    report gluegen-rt.$JAR_SUFFIX jogl-all.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_awt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz
     echo
 
     echo JOGL ALL no AWT
-    report gluegen-rt.$JAR_SUFFIX jogl.all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz
+    report gluegen-rt.$JAR_SUFFIX jogl-all-noawt.$JAR_SUFFIX libgluegen-rt.so.gz libnativewindow_x11.so.gz libjogl_desktop.so.gz libnewt.so.gz
+    echo
+
+    echo JOGL Min X11 Min egl es1 es2
+    report gluegen-rt.$JAR_SUFFIX atomic/jogl-core.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow-core.$JAR_SUFFIX atomic/newt-core.$JAR_SUFFIX atomic/nativewindow-os-x11.$JAR_SUFFIX atomic/newt-driver-x11.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz libnativewindow_x11.so.gz libnewt.so.gz
     echo
 
     echo JOGL Android - mobile egl es1 es2
-    report gluegen-rt.$JAR_SUFFIX jogl.all-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz
+    report gluegen-rt-android.$JAR_SUFFIX jogl-all-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz
+    echo
+
+    echo JOGL Min Android/Mobile Min egl es1 es2
+    report gluegen-rt-android.$JAR_SUFFIX atomic/jogl-core.$JAR_SUFFIX atomic/jogl-glmobile.$JAR_SUFFIX atomic/jogl-os-android.$JAR_SUFFIX atomic/jogl-util.$JAR_SUFFIX atomic/nativewindow-core.$JAR_SUFFIX atomic/newt-core.$JAR_SUFFIX atomic/newt-driver-android.$JAR_SUFFIX libgluegen-rt.so.gz libjogl_mobile.so.gz
     echo
 }
 
@@ -52,6 +62,7 @@ mkdir -p $STATDIR
 cp -a $BUILDDIR/lib/*.so $STATDIR
 cp -a $BUILDDIR/jar/*    $STATDIR
 cp -a $BUILDDIR_GLUEGEN/gluegen-rt.jar $STATDIR
+cp -a $BUILDDIR_GLUEGEN/gluegen-rt-android.jar $STATDIR
 cp -a $BUILDDIR_GLUEGEN/obj/libgluegen-rt.so $STATDIR
 
 cd $STATDIR
@@ -84,13 +95,14 @@ sort atomic/jogl*.lst | uniq -d
 
 cat atomic/*.lst | sort -u > allparts.lst
 mv nope/*jar .
-cat jogl.all.lst gluegen-rt.lst  | sort -u > allall.lst
+cat jogl-all.lst gluegen-rt.lst  | sort -u > allall.lst
 
 echo all vs allparts delta
 echo
 diff -Nur allparts.lst allall.lst
 
-mv nope/* .
+mv nope/*.jar .
+#mv nope/atomic/*.jar atomic/
 
 listdeployment jar
 
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index f650ffc19..5d12475a5 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -238,10 +238,10 @@ function testawtswt() {
 #testnoawt com.jogamp.newt.opengl.GLWindow $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT $*
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestFloatUtil01MatrixMatrixMultNOUI $*
-testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestPMVMatrix01NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestPMVMatrix01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestNEWTCloseX11DisplayBug565 $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $*