Android integration / cross-test ; Enhance Platform

- android minor build fix
- started dex'ing (gluegen-rt.apk, more to come for full junit tests)
- android remote dalvikvm launch works (crosstest-java-android-armv7-rel.sh)
- android detection, incl version (reflection)

- Platform:
 - Add JAVA_VM_NAME and JAVA_VM_RUNIME
 - OSType maybe ANDROID, where the OS name (String) is Linux ! (ok ?)

1 files changed, 10 insertions, 4 deletions

diff --git a/src/java/com/jogamp/common/util/VersionUtil.java b/src/java/com/jogamp/common/util/VersionUtil.java
index 1589755..b8b7932 100644
--- a/src/java/com/jogamp/common/util/VersionUtil.java
+++ b/src/java/com/jogamp/common/util/VersionUtil.java
@@ -28,6 +28,7 @@
  
 package com.jogamp.common.util;
 
+import com.jogamp.common.os.AndroidVersion;
 import com.jogamp.common.os.Platform;
 
 import java.io.IOException;
@@ -53,16 +54,21 @@ public class VersionUtil {
         sb.append(SEPERATOR).append(Platform.getNewline());
 
         // environment
-        sb.append("Platform: ").append(Platform.getOS()).append(' ').append(Platform.getOSVersion()).append(" (os), ");
+        sb.append("Platform: ").append(Platform.getOSType()).append(" / ").append(Platform.getOSName()).append(' ').append(Platform.getOSVersion()).append(" (os), ");
         sb.append(Platform.getArch()).append(" (arch) ").append(Runtime.getRuntime().availableProcessors()).append(" cores");
         sb.append(Platform.getNewline());
+        if( Platform.OSType.ANDROID == Platform.getOSType() && AndroidVersion.isAvailable) {
+            sb.append("Platform: Android Version: ").append(AndroidVersion.CODENAME).append(", ");
+            sb.append(AndroidVersion.RELEASE).append(" [").append(AndroidVersion.RELEASE).append("], SDK: ").append(AndroidVersion.SDK_INT).append(", ").append(AndroidVersion.SDK_NAME);
+            sb.append(Platform.getNewline());
+        }
 
         Platform.getMachineDescription().toString(sb).append(Platform.getNewline());
 
         // JVM/JRE
-        sb.append("Platform: Java ").append(Platform.getJavaVersion()).append(", ").append(System.getProperty("java.vm.name")).append(", ");
-        sb.append(Platform.getJavaVendor()).append(", ").append(Platform.getJavaVendorURL()).append(", is JavaSE: ").append(Platform.isJavaSE());
-        
+        sb.append("Platform: Java Version: ").append(Platform.getJavaVersion()).append(", VM: ").append(Platform.getJavaVMName());
+        sb.append(", Runtime: ").append(Platform.getJavaRuntimeName()).append(Platform.getNewline());
+        sb.append("Platform: Java Vendor: ").append(Platform.getJavaVendor()).append(", ").append(Platform.getJavaVendorURL()).append(", is JavaSE: ").append(Platform.isJavaSE());        
         sb.append(Platform.getNewline()).append(SEPERATOR);
 
         return sb;