diff options
| author | Xavier Hallade <[email protected]> | 2015-02-16 17:32:29 +0100 |
|---|---|---|
| committer | Xavier Hallade <[email protected]> | 2015-02-16 18:20:20 +0100 |
| commit | 2ccd72b1064464ac277ccfc3951901114c439a99 (patch) | |
| tree | f9434c94ce4f1e0185585dcbf2ec36c9719e27d5 /src | |
| parent | dd2440cbadc642a561d8f92c502fe822b2f11762 (diff) | |
added android x86 support.
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/jogamp/common/os/PlatformPropsImpl.java | 5 |
1 files changed, 3 insertions, 2 deletions
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> |