use the SDK path stored in the preferences

codeanticode · codeanticode · commit 5bcf8d994866 · 2017-02-19T18:10:17.000-05:00
diff --git a/src/processing/mode/android/SysImageDownloader.java b/src/processing/mode/android/SysImageDownloader.java
@@ -28,6 +28,7 @@
 import org.xml.sax.SAXException;
 
 import processing.app.Platform;
+import processing.app.Preferences;
 import processing.app.ui.Toolkit;
 import processing.core.PApplet;
 
@@ -96,8 +97,10 @@ class DownloadTask extends SwingWorker<Object, Object> {
     protected Object doInBackground() throws Exception {
       result = false;
 
-      File modeFolder = mode.getFolder();
-      File sdkFolder = new File(modeFolder, "sdk");
+      // The SDK should already be detected by the android mode
+      String sdkPrefsPath = Preferences.get("android.sdk.path");
+      File sdkFolder = new File(sdkPrefsPath);
+      File modeFolder = mode.getFolder();      
       if (!sdkFolder.exists()) {
         throw new IOException("SDK folder does not exist " + sdkFolder.getAbsolutePath());
       }
@@ -127,7 +130,7 @@ protected Object doInBackground() throws Exception {
           downloadAndUnpack(downloadUrls.sysImgWearUrl, downloadedSysImgWear, sysImgWearFinalFolder, false);
           fixSourceProperties(sysImgWearFinalFolder);
         } else {
-          // default system images
+          // mobile system images
           File downloadedSysImg = new File(tempFolder, downloadUrls.sysImgFilename);
           File tmp = new File(sysImgFolder, "android-" + AndroidBuild.target_sdk);
           if (!tmp.exists()) tmp.mkdir();
