From 2ccd72b1064464ac277ccfc3951901114c439a99 Mon Sep 17 00:00:00 2001
From: Xavier Hallade <xavier.hallade@intel.com>
Date: Mon, 16 Feb 2015 17:32:29 +0100
Subject: added android x86 support.
---
src/java/jogamp/common/os/PlatformPropsImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/java/jogamp/common/os/PlatformPropsImpl.java b/src/java/jogamp/common/os/PlatformPropsImpl.java
index 0d0063c..2d8bdec 100644
--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
+++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
@@ -269,9 +269,9 @@ public abstract class PlatformPropsImpl {
}
ABI_TYPE = elfABIType;
} else {
- if( AndroidVersion.CPU_TYPE.family == CPUFamily.ARM ||
+ if( AndroidVersion.CPU_TYPE.family == CPUFamily.ARM || AndroidVersion.CPU_TYPE.family == CPUFamily.X86 ||
null == AndroidVersion.CPU_TYPE2 ) {
- // Favor Android-1: Either b/c ARM Family, or no Android-2
+ // Favor Android-1: Either b/c ARM or x86 Family, or no Android-2
ARCH = AndroidVersion.CPU_ABI;
ARCH_lower = ARCH;
CPU_ARCH = AndroidVersion.CPU_TYPE;
@@ -505,6 +505,7 @@ public abstract class PlatformPropsImpl {
* <ul>
* <li>android-armv6</li>
* <li>android-aarch64</li>
+ * <li>android-x86</li>
* <li>linux-armv6</li>
* <li>linux-armv6hf</li>
* <li>linux-i586</li>
--
cgit v1.2.3