Fix Android apk activity; Add apk VersionName; Add jar manifest to apk

- build:
  - exclude android packages if !isAndroid

- aapt:
  - Use individual AndroidManifest xml files
  - optional: incl. our JAR manifest file to support detailed version info
  - use def. GluegenVersionActivity

- APK VersionName: Retrieve and show

- package/extension names:
  - gluegen.jar/apk:    com.jogamp.gluegen
  - gluegen-rt.jar/apk: com.jogamp.common

4 files changed, 84 insertions, 7 deletions

diff --git a/src/java/com/jogamp/common/GlueGenVersion.java b/src/java/com/jogamp/common/GlueGenVersion.java
index c3dcc75..5ae3412 100644
--- a/src/java/com/jogamp/common/GlueGenVersion.java
+++ b/src/java/com/jogamp/common/GlueGenVersion.java
@@ -44,9 +44,15 @@ public class GlueGenVersion extends JogampVersion {
         if(null == jogampCommonVersionInfo) { // volatile: ok
             synchronized(GlueGenVersion.class) {
                 if( null == jogampCommonVersionInfo ) {
-                    final String packageName = "com.jogamp.common";
-                    final Manifest mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), "com.jogamp.common");
-                    jogampCommonVersionInfo = new GlueGenVersion(packageName, mf);
+                    final String packageNameCompileTime = "com.jogamp.gluegen";
+                    final String packageNameRuntime = "com.jogamp.common";
+                    Manifest mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), packageNameRuntime);
+                    if(null != mf) {
+                        jogampCommonVersionInfo = new GlueGenVersion(packageNameRuntime, mf);
+                    } else {
+                        mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), packageNameCompileTime);
+                        jogampCommonVersionInfo = new GlueGenVersion(packageNameCompileTime, mf);
+                    }
                 }
             }
         }
diff --git a/src/java/com/jogamp/common/os/AndroidVersion.java b/src/java/com/jogamp/common/os/AndroidVersion.java
index 22786d2..b577631 100644
--- a/src/java/com/jogamp/common/os/AndroidVersion.java
+++ b/src/java/com/jogamp/common/os/AndroidVersion.java
@@ -1,8 +1,6 @@
 package com.jogamp.common.os;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/src/java/com/jogamp/common/util/AndroidPackageUtil.java b/src/java/com/jogamp/common/util/AndroidPackageUtil.java
new file mode 100644
index 0000000..86b25dd
--- /dev/null
+++ b/src/java/com/jogamp/common/util/AndroidPackageUtil.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2011 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+package com.jogamp.common.util;
+
+import java.lang.reflect.Method;
+
+public class AndroidPackageUtil {
+
+    static final Method androidPackageInfoUtilGetVersionName;
+    static final boolean androidPackageInfoUtilAvailable;
+    static {
+        final ClassLoader cl = AndroidPackageUtil.class.getClassLoader();
+        Method m=null; 
+        try {
+            final Class c = ReflectionUtil.getClass("jogamp.common.os.android.PackageInfoUtil", true, cl);
+            m = ReflectionUtil.getMethod(c, "getPackageInfoVersionName", String.class);
+        } catch (Exception e) { /* n/a */ }
+        androidPackageInfoUtilGetVersionName = m;
+        androidPackageInfoUtilAvailable = null != m ;
+    }
+    
+    public static boolean isAndroidPackageInfoAvailable() {
+        return androidPackageInfoUtilAvailable;    
+    }
+    
+    public static String getAndroidPackageInfoVersionName(String packageName) {
+        if(androidPackageInfoUtilAvailable) {
+            return (String) ReflectionUtil.callMethod(null, androidPackageInfoUtilGetVersionName, packageName);
+        }
+        return null;
+    }
+}
+
diff --git a/src/java/com/jogamp/common/util/JogampVersion.java b/src/java/com/jogamp/common/util/JogampVersion.java
index 1af86d3..a2b1e2f 100644
--- a/src/java/com/jogamp/common/util/JogampVersion.java
+++ b/src/java/com/jogamp/common/util/JogampVersion.java
@@ -30,6 +30,7 @@ package com.jogamp.common.util;
 
 import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.os.Platform;
+
 import java.util.Iterator;
 import java.util.Set;
 import java.util.jar.Attributes;
@@ -45,13 +46,16 @@ public class JogampVersion {
     private int hash;
     private Attributes mainAttributes;
     private Set/*<Attributes.Name>*/ mainAttributeNames;
-
-    protected JogampVersion(String packageName, Manifest mf) {
+    
+    private final String androidPackageVersionName;
+    
+    protected JogampVersion(String packageName, Manifest mf) {        
         this.packageName = packageName;
         this.mf = ( null != mf ) ? mf : new Manifest();
         this.hash = this.mf.hashCode();
         mainAttributes = this.mf.getMainAttributes();
         mainAttributeNames = mainAttributes.keySet();
+        androidPackageVersionName = AndroidPackageUtil.getAndroidPackageInfoVersionName(packageName);
     }
 
     @Override
@@ -98,6 +102,9 @@ public class JogampVersion {
     }
 
     public final String getExtensionName() {
+        if(null != androidPackageVersionName) {
+            return packageName;
+        }
         return this.getAttribute(Attributes.Name.EXTENSION_NAME);
     }
 
@@ -129,6 +136,10 @@ public class JogampVersion {
         return this.getAttribute(Attributes.Name.IMPLEMENTATION_VERSION);
     }
 
+    public final String getAndroidPackageVersionName() {
+        return androidPackageVersionName;
+    }
+    
     public final String getSpecificationTitle() {
         return this.getAttribute(Attributes.Name.SPECIFICATION_TITLE);
     }
@@ -162,6 +173,9 @@ public class JogampVersion {
         sb.append("Implementation Version: ").append(getImplementationVersion()).append(nl);
         sb.append("Implementation Branch: ").append(getImplementationBranch()).append(nl);
         sb.append("Implementation Commit: ").append(getImplementationCommit()).append(nl);
+        if(null != getAndroidPackageVersionName()) {
+            sb.append("Android Package Version: ").append(getAndroidPackageVersionName()).append(nl);
+        }
         return sb;
     }