From f4bc09153853b38819fe5451a1682f8ec602940d Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Mon, 4 Mar 2013 19:35:08 +0800
Subject: [PATCH] fix our abi detector

---
 AndroidManifest.xml                   | 2 +-
 src/com/github/shadowsocks/Utils.java | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ba092c06..778eea1a 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.github.shadowsocks"
           android:installLocation="auto"
-          android:versionCode="14"
+          android:versionCode="15"
           android:versionName="1.3.3">
 
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/src/com/github/shadowsocks/Utils.java b/src/com/github/shadowsocks/Utils.java
index abd6097f..2ab89644 100755
--- a/src/com/github/shadowsocks/Utils.java
+++ b/src/com/github/shadowsocks/Utils.java
@@ -73,14 +73,7 @@ public class Utils {
 
     public static String getABI() {
         String abi = getSystemProperty(ABI_PROP);
-        String abi2 = getSystemProperty(ABI2_PROP);
-        if (abi2 != null) {
-            if (abi2.toLowerCase().contains(ARM_ABI)) {
-                return ARM_ABI;
-            } else if (abi2.toLowerCase().contains(X86_ABI)) {
-                return X86_ABI;
-            }
-        } else if (abi != null) {
+        if (abi != null) {
             if (abi.toLowerCase().contains(ARM_ABI)) {
                 return ARM_ABI;
             } else if (abi.toLowerCase().contains(X86_ABI)) {