From a468d08bcacea815f4023f092a4fe5c2c8a3821e Mon Sep 17 00:00:00 2001
From: "Taro L. Saito" <leo@xerial.org>
Date: Thu, 30 Nov 2017 16:43:25 -0800
Subject: [PATCH] Resolve android type first

---
 src/main/java/org/xerial/snappy/OSInfo.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/xerial/snappy/OSInfo.java b/src/main/java/org/xerial/snappy/OSInfo.java
index dd62e47..ff78257 100755
--- a/src/main/java/org/xerial/snappy/OSInfo.java
+++ b/src/main/java/org/xerial/snappy/OSInfo.java
@@ -151,11 +151,6 @@ public class OSInfo {
     }
 
     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 @@ public class OSInfo {
 
     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 {