Merge pull request #705 from processing/download_emu_on_demand

Download emu on demand

Author: codeanticode

debug/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

debug/gradle.properties

@@ -13,3 +13,9 @@
 #Wed Dec 30 11:02:34 EST 2020
 android.enableJetifier=true
 android.useAndroidX=true
+
+# Line to fix the ''module java.base does not "opens java.io" to unnamed module '' error in Android Studio:
+# https://stackoverflow.com/questions/67782975/how-to-fix-the-module-java-base-does-not-opens-java-io-to-unnamed-module
+# Probably not needed if using a version of the Android Gradle Plugin compatible with the JDK:
+# https://docs.gradle.org/current/userguide/compatibility.html
+org.gradle.jvmargs=-Xmx1536M --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED

mode/mode.properties

@@ -4,8 +4,8 @@ url = http://android.processing.org
 sentence = This mode lets you use Processing to create Android apps
 paragraph =
 imports=processing.mode.java.JavaMode
-version = 404
-prettyVersion = 4.5.0a5
+version = 405
+prettyVersion = 4.5.0b1
 minRevision = 1283
 maxRevision = 0
 

mode/src/processing/mode/android/AndroidMode.java

@@ -239,6 +239,11 @@ public void handleRunEmulator(Sketch sketch, AndroidEditor editor,
 
     listener.statusNotice(AndroidMode.getTextString("android_mode.status.building_project"));
     build.build("debug", "");
+    
+    if (sdk.getEmulatorTool() == null) {
+      System.out.println("Try to download the emulator using the SDK Manager...");
+      sdk.downloadEmuOnDemand();
+    }
 
     boolean avd = AVD.ensureProperAVD(editor, this, sdk, build.isWear());
     if (!avd) {

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

@@ -47,6 +47,8 @@
 import java.util.ArrayList;
 import java.util.Date;
 
+import java.io.PrintWriter;
+
 /** 
  * Class holding all needed references (path, tools, etc) to the SDK used by 
  * the mode.
@@ -67,7 +69,8 @@ class AndroidSDK {
   private final File cmdlineTools;
   private final File avdManager;
   private final File sdkManager;
-  private final File emulator;
+
+  private File emulator;
 
   private static final String SDK_DOWNLOAD_URL = 
       "https://developer.android.com/studio/index.html#downloads";
@@ -147,6 +150,25 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
     avdManager = findCliTool(new File(cmdlineTools, "bin"), "avdmanager");
     sdkManager = findCliTool(new File(cmdlineTools, "bin"), "sdkmanager");
 
+    initEmu();
+    
+    String path = Platform.getenv("PATH");
+
+    Platform.setenv("ANDROID_SDK", folder.getCanonicalPath());
+    path = platformTools.getCanonicalPath() + File.pathSeparator +
+      cmdlineTools.getCanonicalPath() + File.pathSeparator + path;
+
+    String javaHomeProp = System.getProperty("java.home");
+    File javaHome = new File(javaHomeProp).getCanonicalFile();
+    Platform.setenv("JAVA_HOME", javaHome.getCanonicalPath());
+    
+    path = new File(javaHome, "bin").getCanonicalPath() + File.pathSeparator + path;    
+    Platform.setenv("PATH", path);
+    
+    checkDebugCertificate();
+  }
+  
+  private void initEmu() throws BadSDKException, IOException {
     File emuFolder = new File(folder, "emulator");
     if (emuFolder.exists()) {
       // First try the new location of the emulator inside its own folder
@@ -158,28 +180,49 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
         emulator = findCliTool(cmdlineTools, "emulator");  
       } else {
         emulator = null;
-        if (SDKDownloader.DOWNLOAD_EMU) {
+        if (SDKDownloader.DOWNLOAD_EMU_WITH_SDK) {
         // Only throw an exception if the downloader was supposed to download the emulator 
         throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_emulator", 
             AndroidBuild.TARGET_SDK, highestPlatform.getAbsolutePath()));
         }
       }      
     }
-    
-    String path = Platform.getenv("PATH");
-
-    Platform.setenv("ANDROID_SDK", folder.getCanonicalPath());
-    path = platformTools.getCanonicalPath() + File.pathSeparator +
-      cmdlineTools.getCanonicalPath() + File.pathSeparator + path;
+  }
+  public boolean downloadEmuOnDemand() {
+    final String[] cmd = new String[] {
+      sdkManager.getAbsolutePath(),
+      "emulator"
+    };
+     
+    ProcessBuilder pb = new ProcessBuilder(cmd);
+    Process process = null;  
+    try {
+      process = pb.start();
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
 
-    String javaHomeProp = System.getProperty("java.home");
-    File javaHome = new File(javaHomeProp).getCanonicalFile();
-    Platform.setenv("JAVA_HOME", javaHome.getCanonicalPath());
-    
-    path = new File(javaHome, "bin").getCanonicalPath() + File.pathSeparator + path;    
-    Platform.setenv("PATH", path);
+    try {
+      new RedirectStreamHandler(new PrintWriter(System.out, true), process.getInputStream());
+      new RedirectStreamHandler(new PrintWriter(System.out, true), process.getErrorStream());
+
+      int emulatorDownloadResultCode = process.waitFor();
+      System.out.println("Output from emulator download " + emulatorDownloadResultCode);
+      if (emulatorDownloadResultCode == 0) {
+        initEmu();
+        return true;
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+    } catch (BadSDKException e) {
+      e.printStackTrace();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    } finally {
+      process.destroy();
+    } 
 
-    checkDebugCertificate();
+    return false;
   }
 
 

mode/src/processing/mode/android/RedirectStreamHandler.java

@@ -0,0 +1,34 @@
+package processing.mode.android;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+
+
+public class RedirectStreamHandler extends Thread {
+    // Streams to redirect from and to
+    private final InputStream input;
+    private final PrintWriter output;
+
+    RedirectStreamHandler(PrintWriter output, InputStream input) {
+      this.input = input;
+      this.output = output;
+      start();
+    }
+
+    @Override
+    public void run() {
+      try {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(input));
+        String line;
+        while ((line = reader.readLine()) != null) {
+            output.println(line);
+        }
+      } catch (IOException ioe) {
+        // OK to ignore...
+        System.out.println("Level.WARNING____I/O Redirection failure: "+ ioe.toString());
+      }
+    }
+  }

mode/src/processing/mode/android/SDKDownloader.java

@@ -66,7 +66,7 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
   private static final String REPOSITORY_LIST = "repository2-1.xml";
   private static final String ADDON_LIST = "addon2-1.xml";
 
-  public static final boolean DOWNLOAD_EMU = false;
+  public static final boolean DOWNLOAD_EMU_WITH_SDK = false;
 
   private JProgressBar progressBar;
   private JLabel downloadedTextArea;
@@ -114,7 +114,7 @@ protected Object doInBackground() throws Exception {
       File haxmFolder = new File(extrasFolder, "intel/HAXM");
       if (!haxmFolder.exists()) haxmFolder.mkdirs();      
 
-      if (DOWNLOAD_EMU) {
+      if (DOWNLOAD_EMU_WITH_SDK) {
         File emulatorFolder = new File(sdkFolder, "emulator");
         if (!emulatorFolder.exists()) emulatorFolder.mkdir();        
       }
@@ -173,7 +173,7 @@ protected Object doInBackground() throws Exception {
           downloadAndUnpack(downloadUrls.haxmUrl, downloadedFolder, haxmFolder, true);
         }
 
-        if (DOWNLOAD_EMU) {
+        if (DOWNLOAD_EMU_WITH_SDK) {
           // Emulator, unpacks directly to sdk folder 
           File downloadedEmulator = new File(tempFolder, downloadUrls.emulatorFilename);
           downloadAndUnpack(downloadUrls.emulatorUrl, downloadedEmulator, sdkFolder, true);          
@@ -391,7 +391,7 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
         throw new IOException(AndroidMode.getTextString("sdk_downloader.error_cannot_find_tools"));
       }
 
-      if (DOWNLOAD_EMU) {
+      if (DOWNLOAD_EMU_WITH_SDK) {
         // -----------------------------------------------------------------------
         // Emulator
         expr = xpath.compile("//remotePackage[@path=\"emulator\"]");