testing haxm install

Author: codeanticode

src/processing/mode/android/AndroidEditor.java

@@ -657,7 +657,8 @@ public void actionPerformed(ActionEvent e) {
     item.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
 //        editor.statusNotice("Resetting the Android Debug Bridge server.");
-        Devices.killAdbServer();
+//        Devices.killAdbServer();
+        SysImageDownloader.installHAXM();
       }
     });
     androidMenu.add(item);    

src/processing/mode/android/EmulatorController.java

@@ -25,7 +25,6 @@
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 
-import processing.app.Base;
 import processing.app.Platform;
 import processing.app.Preferences;
 import processing.app.exec.*;
@@ -92,7 +91,8 @@ synchronized public void launch(File sdkToolsPath, boolean wear, boolean gpu) th
     }
 
     // https://developer.android.com/studio/run/emulator-acceleration.html#accel-graphics
-    String gpuFlag = gpu ? "auto" : "off";
+//    String gpuFlag = gpu ? "auto" : "off";
+    String gpuFlag = "auto";
 
     File emulatorPath = Platform.isWindows() ? new File(sdkToolsPath, "emulator.exe") :
                                                new File(sdkToolsPath, "emulator");

src/processing/mode/android/SysImageDownloader.java

@@ -28,6 +28,8 @@
 
 import processing.app.Platform;
 import processing.app.Preferences;
+import processing.app.exec.LineProcessor;
+import processing.app.exec.StreamPump;
 import processing.app.ui.Toolkit;
 import processing.core.PApplet;
 
@@ -381,28 +383,7 @@ public void run() {
     } else {
       // x86
       Preferences.set("android.system.image.type", "x86");
-      File haxmFolder = AndroidSDK.getHAXMInstallerFolder();     
-      if (haxmFolder.exists() && !Platform.isLinux()) {
-        AndroidUtil.showMessage(HAXM_INSTALL_TITLE, HAXM_INSTALL_MESSAGE);        
-        
-        File exec = new File(haxmFolder, "HAXM installation");
-        System.out.println(exec.getAbsolutePath() + "  " + exec.exists());
-        
-        ProcessBuilder pb;
-        if (Platform.isWindows())
-          pb = new ProcessBuilder("cmd.exe", "/c", "start", "silent_install.bat");
-        else
-          pb = new ProcessBuilder(exec.getAbsolutePath());
-
-//        pb.directory(haxmFolder);
-        try {
-          pb.start().waitFor();
-        } catch (InterruptedException e) {
-          e.printStackTrace();
-        } catch (IOException e) {
-          e.printStackTrace();
-        }
-      }
+      installHAXM();
     }
     downloadTask = new DownloadTask();
     downloadTask.addPropertyChangeListener(this);
@@ -418,6 +399,49 @@ public boolean cancelled() {
   public boolean getResult() {
     return result;
   }
+
+  static public void installHAXM() {
+    File haxmFolder = AndroidSDK.getHAXMInstallerFolder();     
+    if (haxmFolder.exists() && !Platform.isLinux()) {
+      AndroidUtil.showMessage(HAXM_INSTALL_TITLE, HAXM_INSTALL_MESSAGE);        
+      
+      File exec = new File(haxmFolder, "HAXM installation");
+      System.out.println(exec.getAbsolutePath() + "  " + exec.exists());
+      
+      ProcessBuilder pb;
+      if (Platform.isWindows())
+        pb = new ProcessBuilder("cmd.exe", "/c", "start", "silent_install.bat");
+      else
+        pb = new ProcessBuilder(exec.getAbsolutePath());
+      pb.redirectErrorStream(true);
+
+      pb.directory(haxmFolder);
+      Process process = null;      
+      try {
+        process = pb.start();
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+      
+      if (process != null) {
+        try {
+          StreamPump output = new StreamPump(process.getInputStream(), "HAXM: ");
+          output.addTarget(new LineProcessor() {
+            @Override
+            public void processLine(String line) {
+              System.out.println("HAXM: " + line);
+            }
+          }).start();
+
+          process.waitFor();
+        } catch (final InterruptedException ie) {
+          ie.printStackTrace();
+        } finally {
+          process.destroy();
+        }              
+      }
+    }    
+  }
 
   private void createLayout() {
     Container outer = getContentPane();