Merge pull request #130 from omerjerk/master

preferredAbi should be a HashMap instead of an Array

Author: codeanticode

src/processing/mode/android/AVD.java

@@ -7,6 +7,9 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 
 public class AVD {
@@ -48,8 +51,8 @@ public class AVD {
   static ArrayList<String> badList;
 //  static ArrayList<String> skinList;
 
-  private String[] preferredAbi = new String[50];
-  private static ArrayList<String> abiList = new ArrayList<>();
+  private Map<String, String> preferredAbi = new HashMap<>(30);
+  private static List<String> abiList = new ArrayList<>();
 
   /** Default virtual device used by Processing. */
   static public final AVD defaultAVD =
@@ -66,6 +69,7 @@ public AVD(final String name, final String target) {
 
   private void initializeAbiList() {
 	  if (abiList.size() == 0) {
+		  //The order in this list determines the preference of one abi over the other
 		  abiList.add("armeabi");
 		  abiList.add("x86");
 		  abiList.add("x86_64");
@@ -165,11 +169,10 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 		  abi = m[1];
 
 		  if (api != null && abi != null) {
-			int index = Integer.parseInt(api);
-			if (preferredAbi[index] == null) {
-			  preferredAbi[index] = abi;
-			} else if (abiList.indexOf(preferredAbi[index]) < abiList.indexOf(abi)) {
-			  preferredAbi[index] = abi;
+			if (preferredAbi.get(api) == null) {
+			  preferredAbi.put(api, abi);
+			} else if (abiList.indexOf(preferredAbi.get(api)) < abiList.indexOf(abi)) {
+			  preferredAbi.put(api, abi);
 			}
 			api = null;
 			abi = null;
@@ -178,7 +181,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 	  }
 	} catch (InterruptedException e) {}
 
-	if (preferredAbi[Integer.parseInt(AndroidBuild.sdkVersion)] == null) {
+	if (preferredAbi.get(AndroidBuild.sdkVersion) == null) {
 	  return false;
 	}
 
@@ -189,7 +192,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       "-t", target,
       "-c", DEFAULT_SDCARD_SIZE,
       "-s", DEFAULT_SKIN,
-      "--abi", preferredAbi[Integer.parseInt(AndroidBuild.sdkVersion)]
+      "--abi", preferredAbi.get(AndroidBuild.sdkVersion)
     };
 
     // Set the list to null so that exists() will check again