Make abi selectable while creating new AVD

Signed-off-by: Umair Khan <[email protected]>

Author: omerjerk

src/processing/mode/android/AVD.java

@@ -1,6 +1,7 @@
 package processing.mode.android;
 
 import processing.app.Base;
+import processing.app.Preferences;
 import processing.app.exec.ProcessHelper;
 import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
@@ -43,21 +44,26 @@ public class AVD {
 
   /** "android-7" or "Google Inc.:Google APIs:7" */
   protected String target;
+  
+  /** x86, x86_64 or armeabi-v7a **/
+  protected String abi;
+  
+  public static final String PREF_KEY_ABI = "android.sdk.abi";
+  public static final String[] ABI = {"armeabi-v7a", "x86", "x86_64"};
 
   /** Default virtual device used by Processing. */
-  static public final AVD defaultAVD =
-    new AVD("Processing-0" + Base.getRevision(),
-            "android-" + AndroidBuild.sdkVersion);
+  static public AVD defaultAVD;
 //            "Google Inc.:Google APIs:" + AndroidBuild.sdkVersion);
 
   static ArrayList<String> avdList;
   static ArrayList<String> badList;
 //  static ArrayList<String> skinList;
 
 
-  public AVD(final String name, final String target) {
+  public AVD(String name, String target, String abi) {
     this.name = name;
     this.target = target;
+    this.abi = abi;
   }
 
 
@@ -138,12 +144,11 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
       "-t", target,
       "-c", DEFAULT_SDCARD_SIZE,
       "-s", DEFAULT_SKIN,
-      "--abi", "armeabi"
+      "--abi", abi
     };
 
     // Set the list to null so that exists() will check again
     avdList = null;
-
     final ProcessHelper p = new ProcessHelper(params);
     try {
       // Passes 'no' to "Do you wish to create a custom hardware profile [no]"
@@ -171,8 +176,10 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
   }
 
 
-  static public boolean ensureProperAVD(final AndroidSDK sdk) {
+  static public boolean ensureProperAVD(final AndroidSDK sdk, final String abi) {
     try {
+      defaultAVD = new AVD("Processing-0" + Base.getRevision(),
+          "android-" + AndroidBuild.sdkVersion, abi);
       if (defaultAVD.exists(sdk)) {
 //        System.out.println("the avd exists");
         return true;

src/processing/mode/android/AndroidEditor.java

@@ -28,6 +28,7 @@
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -238,7 +239,32 @@ public void run() {
     }.start();
 
     menu.add(sdkMenu);
-
+    menu.addSeparator();
+    
+    final JMenu abiMenu = new JMenu("Select CPU/ABI");
+    for (int i = 0; i < AVD.ABI.length; ++i) {
+      JMenuItem menuItem = new JCheckBoxMenuItem(AVD.ABI[i]);
+      abiMenu.add(menuItem);
+      if (AVD.ABI[i].equals(Preferences.get(AVD.PREF_KEY_ABI))) {
+        menuItem.setSelected(true);
+      }
+    }
+    
+    for (int i = 0; i < abiMenu.getItemCount(); ++i) {
+      final JMenuItem abiItem = abiMenu.getItem(i);
+      abiItem.addActionListener(new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+          for (int j = 0; j < abiMenu.getItemCount(); ++j) {
+            abiMenu.getItem(j).setSelected(false);
+          }
+          abiItem.setSelected(true);
+          Preferences.set(AVD.PREF_KEY_ABI, abiItem.getText());
+        }
+      });
+    }
+    
+    menu.add(abiMenu);
     menu.addSeparator();
 
     item = new JMenuItem("Android SDK Manager");

src/processing/mode/android/AndroidMode.java

@@ -191,7 +191,11 @@ public void handleRunEmulator(Sketch sketch, RunnerListener listener) throws Ske
     listener.statusNotice("Building Android project...");
     build.build("debug");
 
-    boolean avd = AVD.ensureProperAVD(sdk);
+    String abi = Preferences.get(AVD.PREF_KEY_ABI);
+    if (abi.equals("")) {
+      abi = "x86_64";
+    }
+    boolean avd = AVD.ensureProperAVD(sdk, abi);
     if (!avd) {
       SketchException se =
         new SketchException("Could not create a virtual device for the emulator.");