Use full path of emulator

Author: rupak0577

src/processing/mode/android/AndroidMode.java

@@ -298,7 +298,7 @@ public void handleRunEmulator(Sketch sketch, AndroidEditor editor,
     }
 
     int comp = build.getAppComponent();
-    Future<Device> emu = Devices.getInstance().getEmulator(build.isWear(), build.usesOpenGL());    
+    Future<Device> emu = Devices.getInstance().getEmulator(sdk.getToolsFolder(), build.isWear(), build.usesOpenGL());
     runner = new AndroidRunner(build, listener);
     runner.launch(emu, comp, true);
   }

src/processing/mode/android/Commander.java

@@ -239,7 +239,7 @@ private void execute() {
         if (task == RUN) {
           AndroidRunner runner = new AndroidRunner(build, this);
           runner.launch(runOnEmu ?
-              Devices.getInstance().getEmulator(build.isWear(), build.usesOpenGL()) :
+              Devices.getInstance().getEmulator(androidMode.getSDK().getToolsFolder(), build.isWear(), build.usesOpenGL()) :
               Devices.getInstance().getHardware(), build.getAppComponent(), runOnEmu);
         }
 

src/processing/mode/android/Devices.java

@@ -24,6 +24,7 @@
 import processing.app.exec.ProcessResult;
 import processing.mode.android.EmulatorController.State;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -111,10 +112,10 @@ public void run() {
   }
 
 
-  public Future<Device> getEmulator(final boolean wear, final boolean gpu) {
+  public Future<Device> getEmulator(final File sdkToolsPath, final boolean wear, final boolean gpu) {
     final Callable<Device> androidFinder = new Callable<Device>() {
       public Device call() throws Exception {
-        return blockingGetEmulator(wear, gpu);
+        return blockingGetEmulator(sdkToolsPath, wear, gpu);
       }
     };
     final FutureTask<Device> task = new FutureTask<Device>(androidFinder);
@@ -123,7 +124,7 @@ public Device call() throws Exception {
   }
 
 
-  private final Device blockingGetEmulator(final boolean wear, final boolean gpu) {
+  private final Device blockingGetEmulator(File sdkToolsPath, final boolean wear, final boolean gpu) {
 //    System.out.println("going looking for emulator");
     String port = AVD.getPort(wear);
     Device emu = find(true, port);
@@ -138,7 +139,7 @@ private final Device blockingGetEmulator(final boolean wear, final boolean gpu)
     if (emuController.getState() == State.NOT_RUNNING) {
       try {
 //        System.out.println("not running, gonna launch");
-        emuController.launch(wear, gpu); // this blocks until emulator boots
+        emuController.launch(sdkToolsPath, wear, gpu); // this blocks until emulator boots
 //        System.out.println("not just gonna, we've done the launch");
       } catch (final IOException e) {
         System.err.println("Problem while launching emulator.");

src/processing/mode/android/EmulatorController.java

@@ -21,6 +21,7 @@
 
 package processing.mode.android;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 
@@ -60,7 +61,7 @@ public void setState(final State state) {
    * Blocks until emulator is running, or some catastrophe happens.
    * @throws IOException
    */
-  synchronized public void launch(boolean wear, boolean gpu) throws IOException {
+  synchronized public void launch(File sdkToolsPath, boolean wear, boolean gpu) throws IOException {
     if (state != State.NOT_RUNNING) {
       String illegal = "You can't launch an emulator whose state is " + state;
       throw new IllegalStateException(illegal);
@@ -90,8 +91,11 @@ synchronized public void launch(boolean wear, boolean gpu) throws IOException {
     }
 
     String gpuFlag = gpu ? "on" : "off";
+    File emulatorPath = new File(sdkToolsPath, "emulator");
+    if(!emulatorPath.exists())
+      emulatorPath = new File(sdkToolsPath, "emulator.exe"); //Windows
     final String[] cmd = new String[] {
-      "emulator",
+      emulatorPath.getCanonicalPath(),
       "-avd", avdName,
       "-port", portString,
 //      "-no-boot-anim",  // does this do anything?