From 54d0ff131097a2cd9a91a0c1dd84deb8b1f7d0ac Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 15 Jun 2012 05:21:43 +0200
Subject: Fix Bug 583: Remove Android compile-time dependencies and exclude
 Android specific classes for non Android platforms.

Adapt to GlueGen commits: b3c9951006f9bd863244f1db3d54ac7866d66f0a, 86c1df6fdca183454ff544857f4236b646c4730d

Ensure same Java JAR content regardless of build target (fix).

Separate Android compilation results: jogl.all-android.jar and jogl.test-android.jar
avoiding generating different content w/ non android builds.

Adding ${android.abi} to APK target name (jogl.all-android.apk -> jogl.all-android-armeabi-v7a.apk)
if not generic.
---
 make/build-common.xml                 | 41 +++++++++++----
 make/build-jogl.xml                   | 19 +++----
 make/build-newt.xml                   | 48 ++++++++++++------
 make/build-test.xml                   | 94 ++++++++++++++++++++++++-----------
 make/build.xml                        |  8 +--
 make/joglversion-test-android         | 13 +++++
 make/scripts/adb-install-all-armv7.sh |  8 +--
 make/scripts/adb-launch-main.sh       |  2 +-
 make/scripts/adb-uninstall-all.sh     |  4 +-
 9 files changed, 160 insertions(+), 77 deletions(-)
 create mode 100644 make/joglversion-test-android

(limited to 'make')

diff --git a/make/build-common.xml b/make/build-common.xml
index 6c830f3b8..93835e0f1 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -398,8 +398,10 @@
 
         <!-- JavaSE combinations -->
         <property name="gluegen-rt.jar"                 value="${build.gluegen}/gluegen-rt.jar" />
+        <property name="gluegen-rt-android.jar"         value="${build.gluegen}/gluegen-rt-android.jar" />
         <property name="jogl.test.jar"                  value="${jar}/jogl.test.jar"/>
-        <property name="jogl.test.apk"                  value="${jar}/jogl.test.apk"/>
+        <property name="jogl.test-android.jar"          value="${jar}/jogl.test-android.jar"/>
+        <property name="jogl.test-android.apk"          value="${jar}/jogl.test-android.apk"/>
 
         <!-- JavaSE combinations . AWT -->
         <property name="jogl.all.jar"                   value="${jar}/jogl.all.jar" />
@@ -408,7 +410,7 @@
         <property name="jogl.all-noawt.jar"             value="${jar}/jogl.all-noawt.jar" />
         <property name="jogl.all-mobile.jar"            value="${jar}/jogl.all-mobile.jar" />
         <property name="jogl.all-android.jar"           value="${jar}/jogl.all-android.jar" />
-        <property name="jogl.all-android.apk"           value="${jar}/jogl.all-android.apk" />
+        <property name="jogl.all-android.apk"           value="${jar}/jogl.all-android-${android.abi}.apk" />
 
         <path id="swt_gluegen.classpath">
             <pathelement location="${gluegen-rt.jar}" />
@@ -422,29 +424,47 @@
             <path refid="nativewindow_all_atoms.classpath" />
         </path>
 
-        <path id="android_nativewindow_gluegen.classpath">
+        <path id="nativewindow_gluegen_android.classpath">
             <pathelement location="${android.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${gluegen-rt-android.jar}" />
             <pathelement location="${swt.jar}" />
             <path refid="nativewindow_all_atoms.classpath" />
         </path>
 
         <!-- NEWT Compilation .. -->
         <path id="jogl_nativewindow_gluegen.classpath">
-            <pathelement location="${android.jar}" />
             <pathelement location="${gluegen-rt.jar}" />
             <pathelement location="${swt.jar}" />
             <path refid="nativewindow_all_atoms.classpath" />
             <path refid="jogl_all_atoms.classpath" />
         </path>
 
+        <path id="jogl_nativewindow_gluegen_android.classpath">
+            <pathelement location="${android.jar}" />
+            <pathelement location="${gluegen-rt-android.jar}" />
+            <pathelement location="${swt.jar}" />
+            <path refid="nativewindow_all_atoms.classpath" />
+            <path refid="jogl_all_atoms.classpath" />
+        </path>
+
         <!-- Test Compilation .. -->
+        <path id="junit_jogl_newt.compile.classpath">
+            <pathelement location="${junit.jar}" />
+            <pathelement location="${ant.jar}" />
+            <pathelement location="${ant-junit.jar}" />
+            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${swt.jar}" />
+            <path refid="nativewindow_all_atoms.classpath" />
+            <path refid="jogl_all_atoms.classpath" />
+            <path refid="newt_all_atoms.classpath" />
+        </path>
+
         <path id="junit_jogl_newt_android.compile.classpath">
             <pathelement location="${android.jar}" />
             <pathelement location="${junit.jar}" />
             <pathelement location="${ant.jar}" />
             <pathelement location="${ant-junit.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${gluegen-rt-android.jar}" />
             <pathelement location="${swt.jar}" />
             <path refid="nativewindow_all_atoms.classpath" />
             <path refid="jogl_all_atoms.classpath" />
@@ -453,7 +473,7 @@
         </path>
 
         <!-- Postbuild: javadoc .. -->
-        <path id="jogl_all.classpath">
+        <path id="jogl_doc.classpath">
             <pathelement location="${android.jar}" />
             <pathelement location="${gluegen-rt.jar}" />
             <pathelement location="${swt.jar}" />
@@ -485,7 +505,6 @@
         <property name="junit_jogl_noawt.run.jars"
                   value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/>
         <property name="junit_jogl_noawt.run.remote.jars" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${jogl.test.jar}"/>
-        <property name="junit.run.remote.apks" value="${gluegen.root}/${rootrel.build}/jogamp.android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt.apk${path.separator}${jogl.all-android.apk}${path.separator}${jogl.test.apk}"/>
 
         <!-- Test Run w/ SWT .. -->
         <path id="junit_jogl_swt.run.classpath">
@@ -506,12 +525,14 @@
             <pathelement location="${ant.jar}" />
             <pathelement location="${ant-junit.jar}" />
             <pathelement location="${android.jar}" />
-            <pathelement location="${gluegen-rt.jar}" />
+            <pathelement location="${gluegen-rt-android.jar}" />
             <pathelement location="${jogl.all-android.jar}" />
             <pathelement location="${jogl.test.jar}" />
         </path>
         <property name="junit_jogl_android.run.jars"
-                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-android.jar}${path.separator}${jogl.test.jar}"/>
+                  value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt-android.jar}${path.separator}${jogl.all-android.jar}${path.separator}${jogl.test.jar}"/>
+        <property name="junit.run.remote.apks" 
+                  value="${gluegen.root}/${rootrel.build}/jogamp.android-launcher.apk${path.separator}${ant-junit-all.apk}${path.separator}${gluegen.root}/${rootrel.build}/gluegen-rt-android-${android.abi}.apk${path.separator}${jogl.all-android.apk}${path.separator}${jogl.test.apk}"/>
 
         <!-- Dummy extra CLASSPATH value, maybe overwritten -->  
         <property name="junit_extra_classpath" value=""/>
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index f80efdfc7..0c7328c4a 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -194,20 +194,13 @@
            <isset property="setup.noSWT"/> 
         </condition>
 
-        <condition property="java.excludes.android"
-                   value="${java.part.android}">
-           <not>
-               <isset property="isAndroid"/> 
-           </not>
-        </condition>
-
         <property name="java.excludes.javadoc.packagenames"
                   value="jogamp.opengl.gl2.fixme.*,com.jogamp.audio.windows.waveout.TestSpatialization"/>
 
         <property name="java.excludes.fixme" 
                   value="jogamp/opengl/gl2/fixme/** com/jogamp/audio/windows/waveout/TestSpatialization.java" />
 
-        <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.awt} ${java.excludes.swt} ${java.excludes.android}" />
+        <property name="java.excludes.all" value="${java.excludes.fixme} ${java.excludes.awt} ${java.excludes.swt}" />
         <echo message="java.excludes.all: ${java.excludes.all}" />
     </target>
 
@@ -1043,10 +1036,10 @@
         </javac>
     </target>
 
-    <target name="java.compile.secondpass.javase" unless="isAndroid">
+    <target name="java.compile.secondpass.javase">
         <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
         <javac destdir="${classes}"
-               excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
+               excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all},${java.part.android}"
                fork="yes"
                includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
@@ -1064,7 +1057,7 @@
     <target name="java.compile.secondpass.android" if="isAndroid">
         <!-- Perform the second pass Java compile; everything except portion of fixed function emulation depending on generated code. -->
         <javac destdir="${classes}"
-               excludes="com/jogamp/opengl/util/glsl/fixedfunc/FixedFuncUtil.java,${java.excludes.all}"
+               includes="${java.part.android}"
                fork="yes"
                includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
@@ -1073,7 +1066,7 @@
                target="${target.targetlevel}" 
                bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="android_nativewindow_gluegen.classpath"/>
+            <classpath refid="nativewindow_gluegen_android.classpath"/>
             <src path="${src.java}" />
             <src path="${src.generated.java}" />
         </javac>
@@ -1085,7 +1078,7 @@
     <target name="java.compile.thirdpass.javase">
         <!-- Perform the third pass Java compile; everything including fixed function emulation. -->
         <javac destdir="${classes}"
-               excludes="${java.excludes.all}"
+               excludes="${java.excludes.all},${java.part.android}"
                fork="yes"
                includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
diff --git a/make/build-newt.xml b/make/build-newt.xml
index 2bf04bbae..9df46d77a 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -203,9 +203,8 @@
        - Compile the original and generated source.
       -->
     <target name="java.compile.javase">
-        <!-- Perform the second pass Java compile; everything. -->
         <javac destdir="${classes}"
-               excludes="${java.excludes.all}"
+               excludes="${java.excludes.all} ${java.part.driver.android}"
                fork="yes"
                includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
@@ -219,7 +218,21 @@
         </javac>
     </target>
 
-    <target name="java.compile" depends="java.compile.javase" />
+    <target name="java.compile.android" if="isAndroid">
+        <javac destdir="${classes}"
+               excludes="${java.excludes.all}"
+               fork="yes"
+               includeAntRuntime="false"
+               memoryMaximumSize="${javac.memorymax}"
+               encoding="UTF-8"
+               source="${target.sourcelevel}" 
+               target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+            <src path="${src.java}" />
+            <classpath refid="jogl_nativewindow_gluegen_android.classpath"/>
+        </javac>
+    </target>
 
     <!-- ================================================================== -->
     <!--
@@ -644,6 +657,9 @@
       <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Window" />
       <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Screen" />
       <javah destdir="${src.generated.c}/X11"         classpath="${javah.classpath}" class="jogamp.newt.driver.x11.X11Display" />
+    </target>
+
+    <target name="c.build.newt.prepare.android" if="isAndroid">
       <javah destdir="${src.generated.c}/Android"     classpath="${javah.classpath}:${android.jar}" class="jogamp.newt.driver.android.AndroidWindow" />
     </target>
 
@@ -662,7 +678,7 @@
     <target name="c.build.newt.natives" depends="c.build.newt.windowlib" unless="setup.nonatives">
     </target>
 
-    <target name="c.build.newt" depends="c.configure,c.build.newt.prepare,c.build.newt.natives">
+    <target name="c.build.newt" depends="c.configure,c.build.newt.prepare,c.build.newt.prepare.android,c.build.newt.natives">
       <antcall target="c.manifest" inheritRefs="true" />
     </target>
 
@@ -670,8 +686,6 @@
     <!--
        - Build the newt.jar files.
       -->
-    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase" />
-
     <target name="setup-manifestfile">
         <property name="manifestfile" value="newtversion"/>
         <copy file="${manifestfile}"
@@ -713,10 +727,6 @@
             <fileset dir="${classes}"
                      includes="${java.part.driver.macosx}"/>
         </jar>
-        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.android.jar}" filesonly="true">
-            <fileset dir="${classes}"
-                     includes="${java.part.driver.android}"/>
-        </jar>
         <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.kd.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.driver.kd}"/>
@@ -746,6 +756,16 @@
                 <include name="jogamp/newt/Debug*" />
             </fileset>
         </jar>
+    </target>
+
+    <target name="build-jars-android" depends="setup-manifestfile" if="isAndroid">
+        <jar manifest="${build.newt}/manifest.mf" destfile="${newt.driver.android.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="${java.part.driver.android}"/>
+        </jar>
+    </target>
+
+    <target name="build-jars-native" depends="gluegen.cpptasks.detect.os,setup-manifestfile">
         <jar manifest="${build.newt}/manifest.mf" destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
             <fileset dir="${obj.newt}">
               <include name="*.${native.library.suffix}" />
@@ -772,7 +792,7 @@
                  maxmemory="${javac.memorymax}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
-         <classpath refid="jogl_nativewindow_gluegen.classpath"/>
+         <classpath refid="jogl_doc.classpath"/>
         </javadoc>
     </target>
 
@@ -788,7 +808,7 @@
                  maxmemory="${javac.memorymax}"
                  linkoffline="${javadoc.link} 142-packages"
                  bottom="${javadoc.bottom}" >
-         <classpath refid="jogl_nativewindow_gluegen.classpath"/>
+         <classpath refid="jogl_doc.classpath"/>
         </javadoc>
     </target>
 
@@ -804,7 +824,7 @@
                  maxmemory="${javac.memorymax}"
                  linkoffline="${javadoc.link} 142-packages"
          bottom="${javadoc.bottom}" >
-         <classpath refid="jogl_nativewindow_gluegen.classpath"/>
+         <classpath refid="jogl_doc.classpath"/>
         </javadoc>
     </target>
 
@@ -827,7 +847,7 @@
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,java.compile,c.build.newt,build-jars,generate.version.txt" />
+    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,java.compile.javase,build-jars-javase,java.compile.android,build-jars-android,c.build.newt,generate.version.txt" />
 
     <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
diff --git a/make/build-test.xml b/make/build-test.xml
index 75c319068..f5437902e 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -26,7 +26,8 @@
         <property name="classes"              value="${build.test}/classes" />
         <property name="classes.path"         location="${classes}"/> <!-- absolute path -->
 
-        <property name="java.part.test"       value="com/jogamp/** jogamp/**"/>
+        <property name="java.part.test.all"   value="com/jogamp/** jogamp/**"/>
+        <property name="java.part.test.android" value="com/jogamp/opengl/test/android/**"/>
         <property name="java.dir.test"        value="com/jogamp/opengl/test"/>
         <property name="java.dir.junit"       value="${java.dir.test}/junit"/>
         <property name="java.dir.bugs"        value="${java.dir.test}/bugs"/>
@@ -58,25 +59,10 @@
     <!--
        - Build/run tests/junit.
       -->
-    <target name="android.test.package" if="isAndroid">
-        <aapt.signed 
-            assetsdir="resources/assets-test"
-            jarsrcdir="${src}/test"
-            jarbuilddir="${jar}"
-            jarbasename="jogl.test"
-            nativebuilddir="${lib}"
-            nativebasename="non-existing"
-            android.abi="${android.abi}"
-            androidmanifest.path="resources/android/AndroidManifest-test.xml"
-            androidresources.path="resources/android/res-test"
-            jarmanifest.path="${build.test}/manifest-test.mf"
-            version.code="${jogl_int_version}"
-            version.name="${jogl.version.plus}" />
-    </target>
-
-    <target name="test.compile.java">
-        <!-- Perform the junit pass Java compile -->
+    <target name="test.compile.javase">
+        <!-- Perform the junit pass Java SE compile -->
         <javac destdir="${classes}"
+               excludes="${java.part.test.android}"
                fork="yes"
                includeAntRuntime="false"
                memoryMaximumSize="${javac.memorymax}"
@@ -85,15 +71,9 @@
                target="${target.targetlevel}" 
                bootclasspath="${target.rt.jar}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="junit_jogl_newt_android.compile.classpath"/>
+            <classpath refid="junit_jogl_newt.compile.classpath"/>
             <src path="${src.test}" />
         </javac>
-        <!-- include any resource files that tests may require -->
-        <copy todir="${classes}">
-            <fileset dir="${src.test}">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
         <copy file="joglversion-test"
             tofile="${build.test}/manifest-test.mf"
             overwrite="true">
@@ -109,9 +89,59 @@
             <!-- get all class files, but skip any resource files that external tools
                  might have copied into the class directory (otherwise, it's possible
                  to get the same resource file twice in the jar) -->
-            <fileset dir="${classes}" includes="${java.part.test}"/>
+            <fileset dir="${classes}" 
+                     includes="${java.part.test.all}"
+                     excludes="${java.part.test.android}"/>
+            <fileset dir="resources/assets-test" includes="**" />
+        </jar>
+    </target>
+
+    <target name="test.compile.android" if="isAndroid">
+        <!-- Perform the junit pass Java Android compile -->
+        <javac destdir="${classes}"
+               fork="yes"
+               includeAntRuntime="false"
+               memoryMaximumSize="${javac.memorymax}"
+               encoding="UTF-8"
+               source="${target.sourcelevel}" 
+               target="${target.targetlevel}" 
+               bootclasspath="${target.rt.jar}"
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+            <classpath refid="junit_jogl_newt_android.compile.classpath"/>
+            <src path="${src.test}" />
+        </javac>
+        <copy file="joglversion-test-android"
+            tofile="${build.test}/manifest-test-android.mf"
+            overwrite="true">
+            <filterset>
+                <filter token="VERSION" value="${jogl.version}"/>
+                <filter token="SCM_BRANCH" value="${jogl.build.branch}"/>
+                <filter token="SCM_COMMIT" value="${jogl.build.commit}"/>
+                <filter token="BASEVERSION" value="${jogl_base_version}"/>
+            </filterset>
+        </copy>
+
+        <jar manifest="${build.test}/manifest-test-android.mf" destfile="${jogl.test-android.jar}" filesonly="true">
+            <!-- get all class files, but skip any resource files that external tools
+                 might have copied into the class directory (otherwise, it's possible
+                 to get the same resource file twice in the jar) -->
+            <fileset dir="${classes}" 
+                     includes="${java.part.test.all}"/>
             <fileset dir="resources/assets-test" includes="**" />
         </jar>
+
+        <aapt.signed 
+            assetsdir="resources/assets-test"
+            jarsrcdir="${src}/test"
+            jarbuilddir="${jar}"
+            jarbasename="jogl.test-android"
+            nativebuilddir="${lib}"
+            nativebasename="non-existing"
+            androidmanifest.path="resources/android/AndroidManifest-test.xml"
+            androidresources.path="resources/android/res-test"
+            jarmanifest.path="${build.test}/manifest-test-android.mf"
+            version.code="${jogl_int_version}"
+            version.name="${jogl.version.plus}" />
     </target>
 
     <target name="test.compile.check" depends="declare.common">
@@ -134,8 +164,14 @@
     </target>
 
     <target name="test.compile" depends="test.compile.check" unless="test.compile.skip">
-        <antcall target="test.compile.java" inheritRefs="true" inheritAll="true"/>
-        <antcall target="android.test.package" inheritRefs="true" inheritAll="true"/>
+        <!-- include any resource files that tests may require -->
+        <copy todir="${classes}">
+            <fileset dir="${src.test}">
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
+        <antcall target="test.compile.javase" inheritRefs="true" inheritAll="true"/>
+        <antcall target="test.compile.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 5f85f9a6e..9258df0e9 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -372,7 +372,7 @@
                  source="${target.sourcelevel}"
                  maxmemory="${javac.memorymax}"
                  bottom="${javadoc.bottom}" >
-            <classpath refid="jogl_all.classpath"/>
+            <classpath refid="jogl_doc.classpath"/>
             <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" />
             <link offline="false" href="${gluegen.link}" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/> 
@@ -394,7 +394,7 @@
                  source="${target.sourcelevel}"
                  maxmemory="${javac.memorymax}"
                  bottom="${javadoc.bottom}" >
-            <classpath refid="jogl_all.classpath"/>
+            <classpath refid="jogl_doc.classpath"/>
             <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" />
             <link offline="false" href="${gluegen.link}" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
@@ -417,7 +417,7 @@
                  source="${target.sourcelevel}"
                  maxmemory="${javac.memorymax}"
                  bottom="${javadoc.bottom}" >
-            <classpath refid="jogl_all.classpath"/>
+            <classpath refid="jogl_doc.classpath"/>
             <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" />
             <link offline="false" href="${gluegen.link}" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
@@ -439,7 +439,7 @@
                  source="${target.sourcelevel}"
                  maxmemory="${javac.memorymax}"
                  bottom="${javadoc.bottom}" >
-            <classpath refid="jogl_all.classpath"/>
+            <classpath refid="jogl_doc.classpath"/>
             <link offline="true" href="${javadoc.link}" packagelistLoc="${gluegen.root}/make/142-packages" />
             <link offline="false" href="${gluegen.link}" />
             <arg line="-J-Dnativetaglet.mapping=${basedir}/native-taglet.properties"/>
diff --git a/make/joglversion-test-android b/make/joglversion-test-android
new file mode 100644
index 000000000..047995bd0
--- /dev/null
+++ b/make/joglversion-test-android
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Specification-Title: Test Java Bindings for OpenGL API Specification
+Specification-Version: @BASEVERSION@
+Specification-Vendor: JogAmp Community
+Implementation-Title: Test Java Bindings for OpenGL Runtime Environment on Android
+Implementation-Version: @VERSION@
+Implementation-Branch: @SCM_BRANCH@
+Implementation-Commit: @SCM_COMMIT@
+Implementation-Vendor: JogAmp Community
+Implementation-URL: http://jogamp.org/
+Extension-Name: com.jogamp.opengl.test
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/scripts/adb-install-all-armv7.sh b/make/scripts/adb-install-all-armv7.sh
index 503c6f2f7..fe9765541 100755
--- a/make/scripts/adb-install-all-armv7.sh
+++ b/make/scripts/adb-install-all-armv7.sh
@@ -1,4 +1,4 @@
-adb $* install ../../gluegen/build-android-armv7/jogamp.android-launcher.apk
-adb $* install ../../gluegen/build-android-armv7/gluegen-rt.apk
-adb $* install ../build-android-armv7/jar/jogl.all-android.apk
-adb $* install ../build-android-armv7/jar/jogl.test.apk
+#adb $* install ../../gluegen/build-android-armv7/jogamp.android-launcher.apk
+#adb $* install ../../gluegen/build-android-armv7/gluegen-rt-android-armeabi-v7a.apk
+adb $* install ../build-android-armv7/jar/jogl.all-android-armeabi-v7a.apk
+adb $* install ../build-android-armv7/jar/jogl.test-android.apk
diff --git a/make/scripts/adb-launch-main.sh b/make/scripts/adb-launch-main.sh
index 0887c107f..ff47a7ab0 100644
--- a/make/scripts/adb-launch-main.sh
+++ b/make/scripts/adb-launch-main.sh
@@ -61,7 +61,7 @@ am start -a android.intent.action.MAIN -n jogamp.android.launcher/jogamp.android
 # \
 #dalvikvm \
 #  -Xjnigreflimit:2000 \
-#  -cp ../../gluegen/make/$BUILD_DIR/jogamp.android-launcher.apk:../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt.apk:$BUILD_DIR/jar/jogl.all-android.apk:$BUILD_DIR/jar/jogl.test.apk:$BUILD_DIR/jar/jogl.android-launcher.apk \
+#  -cp ../../gluegen/make/$BUILD_DIR/jogamp.android-launcher.apk:../../gluegen/make/lib/ant-junit-all.apk:../../gluegen/make/$BUILD_DIR/gluegen-rt-android-armeabi-v7a.apk:$BUILD_DIR/jar/jogl.all-android-armeabi-v7a.apk:$BUILD_DIR/jar/jogl.test.apk \
 #  -Dgluegen.root=../../gluegen \
 #  -Drootrel.build=build-android-armv7 \
 #  com.android.internal.util.WithFramework \
diff --git a/make/scripts/adb-uninstall-all.sh b/make/scripts/adb-uninstall-all.sh
index 1605a0e35..a80c38f61 100755
--- a/make/scripts/adb-uninstall-all.sh
+++ b/make/scripts/adb-uninstall-all.sh
@@ -1,4 +1,4 @@
-adb $* uninstall jogamp.android.launcher
-adb $* uninstall com.jogamp.common
+#adb $* uninstall jogamp.android.launcher
+#adb $* uninstall com.jogamp.common
 adb $* uninstall javax.media.opengl
 adb $* uninstall com.jogamp.opengl.test
-- 
cgit v1.2.3