diff options
| author | Sven Gothel <[email protected]> | 2019-03-26 21:13:51 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-03-26 21:13:51 +0100 |
| commit | 27f0a367e89a4a6a03919d1889807ff6307ee0cf (patch) | |
| tree | c45eaf38ad669c5d5811f7bfbf2886d5e27a831d /src/java | |
| parent | 0c567321c6d594ec11edfd3aa848a0a634c544ef (diff) | |
| parent | 2ccd72b1064464ac277ccfc3951901114c439a99 (diff) | |
Merge pull request #25 from ghost/master
adding support for android x86 targets - revised
Diffstat (limited to 'src/java')
| -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 097a013..fdd6b7f 100644 --- a/src/java/jogamp/common/os/PlatformPropsImpl.java +++ b/src/java/jogamp/common/os/PlatformPropsImpl.java @@ -275,9 +275,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; @@ -511,6 +511,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> |