Simplify compat.SupportedArchitectures

F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java

@@ -5,33 +5,18 @@ import android.os.Build;
 
 public class SupportedArchitectures extends Compatibility {
 
-    @SuppressWarnings("deprecation")
-    private static final String[] getAbisDonut() {
-        return new String[]{Build.CPU_ABI};
-    }
-
-    @SuppressWarnings("deprecation")
-    @TargetApi(8)
-    private static final String[] getAbisFroyo() {
-        return new String[]{Build.CPU_ABI, Build.CPU_ABI2};
-    }
-
-    @TargetApi(21)
-    private static final String[] getAbisLollipop() {
-        return Build.SUPPORTED_ABIS;
-    }
-
     /**
      * The most preferred ABI is the first element in the list.
      */
-    public static final String[] getAbis() {
+    @SuppressWarnings("deprecation")
+    public static String[] getAbis() {
         if (hasApi(21)) {
-            return getAbisLollipop();
+            return new String[]{Build.CPU_ABI};
         }
         if (hasApi(8)) {
-            return getAbisFroyo();
+            return new String[]{Build.CPU_ABI, Build.CPU_ABI2};
         }
-        return getAbisDonut();
+        return Build.SUPPORTED_ABIS;
     }
 
 }