check if target ABIs exist

Author: codeanticode

src/processing/mode/android/AVD.java

@@ -180,9 +180,9 @@ protected boolean badness() {
     return false;
   }
 
-
-  protected boolean create(final AndroidSDK sdk) throws IOException {
-
+  
+  protected void initTargets(final AndroidSDK sdk) throws IOException {
+    preferredAbi.clear();
     final String[] list_abi = {
         sdk.getAndroidToolPath(),
         "list", "targets"
@@ -213,6 +213,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 
         if (api != null && abis != null) {
           for (String abi: abis) {
+            if (abiList.indexOf(abi) == -1) continue;
             if (preferredAbi.get(api) == null) {
               preferredAbi.put(api, abi);
             } else if (abiList.indexOf(preferredAbi.get(api)) < abiList.indexOf(abi)) {
@@ -243,7 +244,18 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 //          }
 //        }
       }
-    } catch (InterruptedException e) {}
+    } catch (InterruptedException e) {}  
+  }
+  
+  
+  protected boolean noTargets(final AndroidSDK sdk) throws IOException {
+    initTargets(sdk); 
+    return preferredAbi.size() == 0;    
+  }
+  
+
+  protected boolean create(final AndroidSDK sdk) throws IOException {
+    initTargets(sdk);
 
     final String[] params = {
       sdk.getAndroidToolPath(),
@@ -261,7 +273,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
     // Set the list to null so that exists() will check again
     avdList = null;
 
-    p = new ProcessHelper(params);
+    ProcessHelper p = new ProcessHelper(params);
     try {
       // Passes 'no' to "Do you wish to create a custom hardware profile [no]"
       final ProcessResult createAvdResult = p.execute("no");
@@ -286,19 +298,21 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
 
   static public boolean ensureProperAVD(final Frame window, final AndroidMode mode, 
       final AndroidSDK sdk) {
-    try {
-      
+    try {      
       if (AndroidBuild.appComponent == AndroidBuild.WATCHFACE) {
         if (wearAVD.exists(sdk)) {
           return true;
         }
         if (wearAVD.badness()) {
+          Messages.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
+          return false;
+        }
+        if (wearAVD.noTargets(sdk)) {
           boolean res = AndroidSDK.locateSysImage(window, mode, true);
           if (!res) {
-            Messages.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
-            return false;
+            return false;  
           }
-        }
+        }        
         if (wearAVD.create(sdk)) {
           return true;
         }    
@@ -307,17 +321,19 @@ static public boolean ensureProperAVD(final Frame window, final AndroidMode mode
           return true;
         }
         if (defaultAVD.badness()) {
+          Messages.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
+          return false;
+        }    
+        if (defaultAVD.noTargets(sdk)) {
           boolean res = AndroidSDK.locateSysImage(window, mode, false);
           if (!res) {
-            Messages.showWarningTiered("Android Error", AVD_LOAD_PRIMARY, AVD_LOAD_SECONDARY, null);
-            return false;
+            return false;  
           }
-        }
+        }        
         if (defaultAVD.create(sdk)) {
           return true;
         }
       }
-      
     } catch (final Exception e) {
       Messages.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
                                  String.format(AVD_CREATE_SECONDARY,

src/processing/mode/android/SysImageDownloader.java

@@ -260,7 +260,7 @@ public static String humanReadableByteCount(long bytes, boolean si) {
   }
 
   public SysImageDownloader(Frame editor, AndroidMode mode, boolean wear) {
-    super(editor, "SDK download", true);
+    super(editor, "Emulator download", true);
     this.editor = editor;
     this.mode = mode;
     this.wear = wear;