support new emulator location

Author: codeanticode

mode/src/processing/mode/android/AVD.java

@@ -160,8 +160,8 @@ static protected void list(final AndroidSDK sdk) throws IOException {
     try {
       avdList = new ArrayList<String>();
       badList = new ArrayList<String>();
-      ProcessBuilder pb =
-              new ProcessBuilder(sdk.getAvdManagerPath(), "list", "avd");
+      File avdManager = sdk.getAVDManagerTool();
+      ProcessBuilder pb = new ProcessBuilder(avdManager.getCanonicalPath(), "list", "avd");
       Map<String, String> env = pb.environment();
       env.clear();
       env.put("JAVA_HOME", Platform.getJavaHome().getCanonicalPath());
@@ -286,12 +286,13 @@ protected void refreshImages(final AndroidSDK sdk) throws IOException {
 
   protected void getImages(final ArrayList<String> images, final AndroidSDK sdk, 
       final String imageAbi) throws IOException {
-    boolean wear = type == WEAR;
+    final boolean wear = type == WEAR;
     final String imagePlatform = getPreferredPlatform(wear, imageAbi);
     final String imageTag = getPreferredTag(wear, imageAbi); 
 
+    final File avdManager = sdk.getAVDManagerTool();
     final String[] cmd = new String[] {
-        sdk.getAvdManagerPath(),
+        avdManager.getCanonicalPath(),
         "create", "avd",
         "-n", "dummy",
         "-k", "dummy"
@@ -361,8 +362,9 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
     if (!androidFolder.exists()) androidFolder.mkdir();    
     File avdPath = new File(androidFolder, "avd/" + name);
 
+    File avdManager = sdk.getAVDManagerTool();
     final String[] cmd = new String[] {
-        sdk.getAvdManagerPath(),
+        avdManager.getCanonicalPath(),
         "create", "avd",
         "-n", name,      
         "-k", getSdkId(),

mode/src/processing/mode/android/AndroidBuild.java

@@ -553,7 +553,7 @@ private void writeResXMLWatchFace(final File xmlFolder) {
 
   private void writeLocalProps(final File file) {
     final PrintWriter writer = PApplet.createWriter(file);
-    final String sdkPath = sdk.getSdkFolder().getAbsolutePath();
+    final String sdkPath = sdk.getFolder().getAbsolutePath();
     if (Platform.isWindows()) {
       // Windows needs backslashes escaped, or it will also accept forward
       // slashes in the build file. We're using the forward slashes since this

mode/src/processing/mode/android/AndroidSDK.java

@@ -61,12 +61,13 @@ class AndroidSDK {
   private final File folder;
   private final File tools;
   private final File platforms;
-  private final File highestPlatform;
+  private final File highestPlatform;  
   private final File androidJar;
   private final File platformTools;
   private final File buildTools;
   private final File avdManager;
   private final File sdkManager;
+  private final File emulator;
 
   private static final String SDK_DOWNLOAD_URL = 
       "https://developer.android.com/studio/index.html#downloads";
@@ -122,7 +123,6 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
     ArrayList<SDKTarget> targets = getAvailableSdkTargets();
     int highest = 1;
     for (SDKTarget targ: targets) {
-      System.out.println(targ);
       if (highest < targ.version) {
         highest = targ.version;
       }
@@ -143,7 +143,16 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
 
     avdManager = findCliTool(new File(tools, "bin"), "avdmanager");
     sdkManager = findCliTool(new File(tools, "bin"), "sdkmanager");
-
+    
+    File emuFolder = new File(folder, "emulator");
+    if (emuFolder.exists()) {
+      // First try the new location of the emulator inside its own folder
+      emulator = findCliTool(emuFolder, "emulator");   
+    } else {
+      // If not found, use old location inside tools
+      emulator = findCliTool(tools, "emulator");
+    }
+    
     String path = Platform.getenv("PATH");
 
     Platform.setenv("ANDROID_SDK", folder.getCanonicalPath());
@@ -214,28 +223,9 @@ protected void checkDebugCertificate() {
   }
 
 
-  public File getToolsFolder() {
-    return tools;
-  }
-
-
-  public String getAvdManagerPath() {
-    return avdManager.getAbsolutePath();
-  }
-
-
-  public File getSdkFolder() {
+  public File getFolder() {
     return folder;
   }
-
-
-  public File getHighestPlatform() {
-    return highestPlatform;
-  }
-  
-  public File getAndroidJarPath() {
-    return androidJar;  
-  }
 
 
   public File getBuildToolsFolder() {
@@ -246,17 +236,32 @@ public File getBuildToolsFolder() {
   public File getPlatformToolsFolder() {
     return platformTools;
   }
-
 
-//  public File getWearableFolder() {
-//    return wearablePath;
-//  }
 
+  public File getAndroidJarPath() {
+    return androidJar;  
+  }  
+  
+  
+  public File getToolsFolder() {
+    return tools;
+  }
 
-//  public File getSupportLibrary() {
-//    return supportLibPath;
-//  } 
 
+  public File getEmulatorTool() {
+    return emulator;
+  }
+  
+
+  public File getAVDManagerTool() {
+    return avdManager;
+  }
+
+
+  public File getHighestPlatform() {
+    return highestPlatform;
+  }
+
 
   public File getZipAlignTool() {    
     File[] files = buildTools.listFiles();
@@ -276,8 +281,7 @@ public File getZipAlignTool() {
   private static final String response = "y\ny\ny\ny\ny\ny\ny\ny\ny\ny\n";
 
   private void acceptLicenses() {
-    ProcessBuilder pb = new ProcessBuilder(sdkManager.getAbsolutePath(), 
-                                           "--licenses");
+    ProcessBuilder pb = new ProcessBuilder(sdkManager.getAbsolutePath(), "--licenses");
     pb.redirectErrorStream(true);
     try {
       Process process = pb.start();
@@ -324,14 +328,17 @@ static public File getGoogleDriverFolder() {
 
   /**
    * Checks a path to see if there's a tools/android file inside, a rough check
-   * for the SDK installation. Also figures out the name of android/android.bat
+   * for the SDK installation. Also figures out the name of android/android.bat/android.exe
    * so that it can be called explicitly.
    */
   private static File findCliTool(final File tools, String name) 
       throws BadSDKException {
     if (new File(tools, name + ".bat").exists()) {
       return new File(tools, name + ".bat");
     }
+    if (new File(tools, name + ".exe").exists()) {
+      return new File(tools, name + ".exe");
+    }    
     if (new File(tools, name).exists()) {
       return new File(tools, name);
     }

mode/src/processing/mode/android/EmulatorController.java

@@ -26,7 +26,6 @@
 import java.util.concurrent.CountDownLatch;
 
 import processing.app.Base;
-import processing.app.Platform;
 import processing.app.exec.*;
 
 import processing.core.PApplet;
@@ -75,10 +74,9 @@ synchronized public void launch(final AndroidSDK sdk, final boolean wear)
     // https://developer.android.com/studio/run/emulator-acceleration.html#accel-graphics
     String gpuFlag = "auto";
 
-    File emulatorPath = Platform.isWindows() ? new File(sdk.getToolsFolder(), "emulator.exe") :
-                                               new File(sdk.getToolsFolder(), "emulator");
+    final File emulator = sdk.getEmulatorTool();
     final String[] cmd = new String[] {
-      emulatorPath.getCanonicalPath(),
+      emulator.getCanonicalPath(),
       "-avd", avdName,
       "-port", portString,
       "-gpu", gpuFlag