TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-15 15:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

- Improve architecture detection

Browse Source 
- Add an archAsString function.
This commit is contained in:
SerpentSpirale 2021-08-11 18:00:25 +02:00
parent fed4fe74d5
commit 5d0dff0dca
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Architecture.java
View File

@ -5,8 +5,7 @@ import android.os.Build;
import java.util.Locale; import java.util.Locale;
public class Architecture public class Architecture {
{
public static int UNSUPPORTED_ARCH = -1; public static int UNSUPPORTED_ARCH = -1;
public static int ARCH_ARM64 = 0x1; public static int ARCH_ARM64 = 0x1;
public static int ARCH_ARM = 0x2; public static int ARCH_ARM = 0x2;
@ -49,15 +48,11 @@ public class Architecture
*/ */
public static boolean isx86Device(){ public static boolean isx86Device(){
//We check the whole range of supported ABIs, //We check the whole range of supported ABIs,
//Since zenfones can place arm before their native instruction set. //Since asus zenfones can place arm before their native instruction set.
if(is64BitsDevice()){ String[] ABI = is64BitsDevice() ? Build.SUPPORTED_64_BIT_ABIS : Build.SUPPORTED_32_BIT_ABIS;
for(String str : Build.SUPPORTED_64_BIT_ABIS){ int comparedArch = is64BitsDevice() ? ARCH_X86_64 : ARCH_X86;
if(archAsInt(str) == ARCH_X86_64) return true; for (String str : ABI) {
} if (archAsInt(str) == comparedArch) return true;
}else{
for(String str : Build.SUPPORTED_32_BIT_ABIS){
if(archAsInt(str) == ARCH_X86) return true;
}
} }
return false; return false;
} }
@ -75,16 +70,29 @@ public class Architecture
/** /**
* Convert an architecture from a String to an int. * Convert an architecture from a String to an int.
* @param arch The architecture as a String * @param arch The architecture as a String
* @return The architecture as an int. * @return The architecture as an int, can be UNSUPPORTED_ARCH if unknown.
*/ */
public static int archAsInt(String arch){ public static int archAsInt(String arch){
arch = arch.toLowerCase().trim().replace(" ", ""); arch = arch.toLowerCase().trim().replace(" ", "");
if(arch.contains("arm64") || arch.equals("aarch64")) return ARCH_ARM64; if(arch.contains("arm64") || arch.equals("aarch64")) return ARCH_ARM64;
if(arch.contains("arm")) return ARCH_ARM; if(arch.contains("arm")) return ARCH_ARM;
if(arch.equals("x86_64") || arch.equals("amd64")) return ARCH_X86_64; if(arch.contains("x86_64") || arch.contains("amd64")) return ARCH_X86_64;
if(arch.contains("x86") || (arch.startsWith("i") && arch.endsWith("86"))) return ARCH_X86; if(arch.contains("x86") || (arch.startsWith("i") && arch.endsWith("86"))) return ARCH_X86;
//Shouldn't happen //Shouldn't happen
return UNSUPPORTED_ARCH; return UNSUPPORTED_ARCH;
} }
/**
* Convert to a string an architecture.
* @param arch The architecture as an int.
* @return "arm64" || "arm" || "x86_64" || "x86" || "UNSUPPORTED_ARCH"
*/
public static String archAsString(int arch){
if(arch == ARCH_ARM64) return "arm64";
if(arch == ARCH_ARM) return "arm";
if(arch == ARCH_X86_64) return "x86_64";
if(arch == ARCH_X86) return "x86";
return "UNSUPPORTED_ARCH";
}
} }