Resolve android type first

xerial · Dec 1, 2017 · a468d08 · a468d08
1 parent 039082d
commit a468d08
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/main/java/org/xerial/snappy/OSInfo.java b/src/main/java/org/xerial/snappy/OSInfo.java
@@ -151,11 +151,6 @@ static String getHardwareName() {
     }
 
     static String resolveArmArchType() {
-        // For Android
-        if(isAndroid()) {
-            return "android-arm";
-        }
-
         if(System.getProperty("os.name").contains("Linux")) {
             String armType = getHardwareName();
             // armType (uname -m) can be armv5t, armv5te, armv5tej, armv5tejl, armv6, armv7, armv7l, i686
@@ -207,7 +202,11 @@ else if(armType.startsWith("armv7")) {
 
     public static String getArchName() {
         String osArch = System.getProperty("os.arch");
-        if(osArch.startsWith("arm")) {
+        // For Android
+        if(isAndroid()) {
+            osArch = "android-arm";
+        }
+        else if(osArch.startsWith("arm")) {
             osArch = resolveArmArchType();
         }
         else {