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

5 files changed, 82 insertions, 17 deletions

diff --git a/make/lib/android/AndroidManifest-CompileTime.xml b/make/lib/android/AndroidManifest-CompileTime.xml
new file mode 100644
index 0000000..f9a5600
--- /dev/null
+++ b/make/lib/android/AndroidManifest-CompileTime.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      sharedUserId="com.jogamp.Community" 
+      package="com.jogamp.gluegen">
+
+    <uses-sdk android:minSdkVersion="8" />
+
+    <application android:icon="@drawable/icon" 
+                 android:label="@string/app_name"
+                 android:description="@string/app_descr"
+                 android:persistent="false"
+                 >
+        <activity android:name="jogamp.common.os.android.GluegenVersionActivity"
+                  android:finishOnTaskLaunch="true"
+                  android:launchMode="singleTop"
+                  android:label="@string/activity_v_name"
+                  android:description="@string/activity_v_descr"
+                  >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/make/lib/android/AndroidManifest-Runtime.xml b/make/lib/android/AndroidManifest-Runtime.xml
new file mode 100644
index 0000000..7ad8304
--- /dev/null
+++ b/make/lib/android/AndroidManifest-Runtime.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      sharedUserId="com.jogamp.Community" 
+      package="com.jogamp.common">
+
+    <uses-sdk android:minSdkVersion="8" />
+
+    <application android:icon="@drawable/icon" 
+                 android:label="@string/app_name"
+                 android:description="@string/app_descr"
+                 android:persistent="false"
+                 >
+        <activity android:name="jogamp.common.os.android.GluegenVersionActivity"
+                  android:finishOnTaskLaunch="true"
+                  android:launchMode="singleTop"
+                  android:label="@string/activity_v_name"
+                  android:description="@string/activity_v_descr"
+                  >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/make/lib/android/AndroidManifest-Test.xml b/make/lib/android/AndroidManifest-Test.xml
new file mode 100644
index 0000000..c7c8f03
--- /dev/null
+++ b/make/lib/android/AndroidManifest-Test.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      sharedUserId="com.jogamp.Community" 
+      package="com.jogamp.gluegen.test">
+
+    <uses-sdk android:minSdkVersion="8" />
+
+    <application android:icon="@drawable/icon" 
+                 android:label="@string/app_name"
+                 android:description="@string/app_descr"
+                 android:persistent="false"
+                 >
+        <activity android:name="jogamp.common.os.android.GluegenVersionActivity"
+                  android:finishOnTaskLaunch="true"
+                  android:launchMode="singleTop"
+                  android:label="@string/activity_v_name"
+                  android:description="@string/activity_v_descr"
+                  >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/make/lib/android/AndroidManifest.xml b/make/lib/android/AndroidManifest.xml
deleted file mode 100644
index 121a876..0000000
--- a/make/lib/android/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.jogamp.gluegen">
-    <uses-sdk android:minSdkVersion="8" />
-
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name=".GluegenActivity"
-                  android:label="@string/app_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-    </application>
-</manifest>
diff --git a/make/lib/android/res/values/strings.xml b/make/lib/android/res/values/strings.xml
index 07501cc..f6a6fe4 100644
--- a/make/lib/android/res/values/strings.xml
+++ b/make/lib/android/res/values/strings.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="hello">GlueGen Activity is Greeting You.</string>
-    <string name="app_name">GlueGen</string>
+    <string name="app_name">JogAmp\'s GlueGen Library</string>
+    <string name="app_descr">Contains Dalvik and native code, supporting native bindings.</string>
+    <string name="activity_v_name">GlueGen\'s Version</string>
+    <string name="activity_v_descr">Shows the version of the GlueGen Library.</string>
 </resources>