diff options
-rw-r--r-- | src/java/com/jogamp/common/util/VersionUtil.java | 2 | ||||
-rw-r--r-- | src/java/jogamp/common/os/MachineDescriptionRuntime.java | 11 | ||||
-rw-r--r-- | src/native/common/MachineDescriptionRuntime.c | 9 |
3 files changed, 1 insertions, 21 deletions
diff --git a/src/java/com/jogamp/common/util/VersionUtil.java b/src/java/com/jogamp/common/util/VersionUtil.java index b8b7932..d48eb5d 100644 --- a/src/java/com/jogamp/common/util/VersionUtil.java +++ b/src/java/com/jogamp/common/util/VersionUtil.java @@ -57,7 +57,7 @@ public class VersionUtil { 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) { + if( 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()); diff --git a/src/java/jogamp/common/os/MachineDescriptionRuntime.java b/src/java/jogamp/common/os/MachineDescriptionRuntime.java index 0438d30..1413705 100644 --- a/src/java/jogamp/common/os/MachineDescriptionRuntime.java +++ b/src/java/jogamp/common/os/MachineDescriptionRuntime.java @@ -119,17 +119,6 @@ public class MachineDescriptionRuntime { getAlignmentPointerImpl()); } - public static boolean isAndroid() { - try { - NativeLibrary.ensureNativeLibLoaded(); - return isAndroidImpl(); - } catch (UnsatisfiedLinkError err) { - return AndroidVersion.isAvailable; - } - } - - private static native boolean isAndroidImpl(); - private static native int getPointerSizeInBytesImpl(); private static native long getPageSizeInBytesImpl(); diff --git a/src/native/common/MachineDescriptionRuntime.c b/src/native/common/MachineDescriptionRuntime.c index 1d5286b..a8a69ee 100644 --- a/src/native/common/MachineDescriptionRuntime.c +++ b/src/native/common/MachineDescriptionRuntime.c @@ -13,15 +13,6 @@ #include <gluegen_stdint.h> -JNIEXPORT jboolean JNICALL -Java_jogamp_common_os_MachineDescriptionRuntime_isAndroidImpl(JNIEnv *env, jclass _unused) { -#if defined(ANDROID) - return JNI_TRUE; -#else - return JNI_FALSE; -#endif -} - JNIEXPORT jint JNICALL Java_jogamp_common_os_MachineDescriptionRuntime_getPointerSizeInBytesImpl(JNIEnv *env, jclass _unused) { return sizeof(void *); |