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

1 files changed, 9 insertions, 3 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);
+                    }
                 }
             }
         }