Resolves #378, adding support for detecting ARMv8 on Android.

cleanup_build_scripts
Daniel Johansson 9 years ago
parent cbe87cf41f
commit dc0bcb5d13
  1. 4
      jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java
  2. 4
      jme3-core/src/main/java/com/jme3/system/JmeSystemDelegate.java
  3. 5
      jme3-core/src/main/java/com/jme3/system/Platform.java

@ -122,9 +122,13 @@ public class JmeAndroidSystem extends JmeSystemDelegate {
return Platform.Android_ARM6; return Platform.Android_ARM6;
} else if (arch.contains("v7")) { } else if (arch.contains("v7")) {
return Platform.Android_ARM7; return Platform.Android_ARM7;
} else if (arch.contains("v8")) {
return Platform.Android_ARM8;
} else { } else {
return Platform.Android_ARM5; // unknown ARM return Platform.Android_ARM5; // unknown ARM
} }
} else if (arch.contains("aarch")) {
return Platform.Android_ARM8;
} else { } else {
return Platform.Android_Other; return Platform.Android_Other;
} }

@ -153,6 +153,10 @@ public abstract class JmeSystemDelegate {
return false; return false;
} else if (arch.equals("universal")) { } else if (arch.equals("universal")) {
return false; return false;
} else if (arch.equals("aarch32")) {
return false;
} else if (arch.equals("aarch64")) {
return true;
} else if (arch.equals("arm")) { } else if (arch.equals("arm")) {
return false; return false;
} else { } else {

@ -88,6 +88,11 @@ public enum Platform {
*/ */
Android_ARM7, Android_ARM7,
/**
* Android ARM8
*/
Android_ARM8,
/** /**
* Android x86 * Android x86
*/ */

Loading…
Cancel
Save