Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved isAndroid check in SharedLibraryLoader Should fix #5863 #5897

Closed
wants to merge 1 commit into from
Closed

Improved isAndroid check in SharedLibraryLoader Should fix #5863 #5897

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions gdx/src/com/badlogic/gdx/utils/SharedLibraryLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,22 @@ public class SharedLibraryLoader {
// JDK 8 only.
static public String abi = (System.getProperty("sun.arch.abi") != null ? System.getProperty("sun.arch.abi") : "");

//Since Android 5 multiple checks are necessary
private static boolean performIsAndroidCheck() {
String property = System.getProperty("java.runtime.name");
boolean isAndroid = (property != null && property.contains("Android Runtime"));

property = System.getProperty("java.vm.vendor");
isAndroid = isAndroid || (property != null && property.contains("The Android Project"));

property = System.getProperty("java.vendor");
isAndroid = isAndroid || (property != null && property.contains("The Android Project"));
return isAndroid;
}

static {
boolean isMOEiOS = "iOS".equals(System.getProperty("moe.platform.name"));
String vm = System.getProperty("java.runtime.name");
if (vm != null && vm.contains("Android Runtime")) {
if (performIsAndroidCheck()) {
isAndroid = true;
isWindows = false;
isLinux = false;
Expand Down