tyler.durden
/
snappy-java
mirror of https://github.com/xerial/snappy-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve android type first

This commit is contained in:
Taro L. Saito 2017-11-30 16:43:25 -08:00
parent 039082d8f8
commit a468d08bca
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/xerial/snappy/OSInfo.java
View File

@ -151,11 +151,6 @@ public class OSInfo {
} }
static String resolveArmArchType() { static String resolveArmArchType() {
// For Android
if(isAndroid()) {
return "android-arm";
}
if(System.getProperty("os.name").contains("Linux")) { if(System.getProperty("os.name").contains("Linux")) {
String armType = getHardwareName(); String armType = getHardwareName();
// armType (uname -m) can be armv5t, armv5te, armv5tej, armv5tejl, armv6, armv7, armv7l, i686 // armType (uname -m) can be armv5t, armv5te, armv5tej, armv5tejl, armv6, armv7, armv7l, i686
@ -207,7 +202,11 @@ public class OSInfo {
public static String getArchName() { public static String getArchName() {
String osArch = System.getProperty("os.arch"); String osArch = System.getProperty("os.arch");
if(osArch.startsWith("arm")) { // For Android
if(isAndroid()) {
osArch = "android-arm";
}
else if(osArch.startsWith("arm")) {
osArch = resolveArmArchType(); osArch = resolveArmArchType();
} }
else { else {