Merge pull request #709 from rupeshkumar22/emulator_improvements

Final Emulator Improvements for Apple M1 Silicon and cmdline-tools check

Author: codeanticode

mode/languages/mode.properties

@@ -188,7 +188,8 @@ android_sdk.dialog.accept_sdk_license_body = You need to accept the terms of the
 android_sdk.warn.cannot_run_adb_title = Trouble with adb!
 android_sdk.warn.cannot_run_adb_body = Could not run the adb tool from the Android SDK.\nOne possibility is that its executable permission\nis not properly set. You can try setting this\npermission manually, or re-installing the SDK.\n\nThe mode will be disabled until this problem is fixed.\n
 android_sdk.error.missing_sdk_folder = %s does not exist
-android_sdk.error.missing_tools_folder = There is no tools folder in %s
+android_sdk.error.missing_cmdtools_folder_found_sdktools = There is no cmdline-tools/latest folder in %s and SDK Tools(sdk/tools) got deprecated.\nInstall cmdline-tools in the existing SDK specifically or Create New SDK. 
+android_sdk.error.missing_cmdtools_folder = There is no `cmdline-tools/latest` folder in %s \nInstall cmdline-tools in the existing SDK specifically or Create New SDK. 
 android_sdk.error.missing_platform_tools_folder = There is no platform-tools folder in %s
 android_sdk.error.missing_build_tools_folder = There is no build-tools folder in %s
 android_sdk.error.missing_platforms_folder = There is no platforms folder in %s  

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

@@ -102,13 +102,19 @@ public AndroidSDK(File folder) throws BadSDKException, IOException {
       throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_sdk_folder", folder));
     }
 
-    File tmp = new File(folder, "cmdline-tools/latest");
-    if (!tmp.exists()) {
-      tmp = new File(folder, "tools");
-    } else if (!tmp.exists()) {
-      throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_tools_folder", folder)); 
-    }    
-    cmdlineTools = tmp;
+    File cmdlineTools = new File(folder, "cmdline-tools/latest");
+    // we need only command line tools, as sdk/tools got deprecated and can't be used with java 17
+    if (!cmdlineTools.exists) {
+      // lets be more specific to show the error
+      File sdkTools = new File(folder, "tools");
+      if (sdkTools.exists) {
+    	  throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_cmdtools_folder_found_sdktools", folder));
+      } else {
+    	  throw new BadSDKException(AndroidMode.getTextString("android_sdk.error.missing_cmdtools_folder", folder));
+      }
+    }
+    // if we reached here, that means command line tools exists
+    // ok to go with the command line tools
 
     platformTools = new File(folder, "platform-tools");
     if (!platformTools.exists()) {
@@ -874,4 +880,4 @@ public CancelException(final String message) {
       super(message);
     }
   }    
-}
+}

mode/src/processing/mode/android/SysImageDownloader.java

@@ -2,18 +2,18 @@
 
 /*
  Part of the Processing project - http://processing.org
-
+ 
  Copyright (c) 2016-21 The Processing Foundation
  
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License version 2
  as published by the Free Software Foundation.
-
+ 
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
-
+ 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software Foundation,
  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -253,12 +253,16 @@ private void getDownloadUrls(UrlHolder urlHolder,
       XPathExpression expr;
       NodeList remotePackages;
 
-      if (abi.equals("arm"))
+      if (abi.equals("arm")) {
         expr = xpath.compile("//remotePackage[contains(@path, '" + AVD.TARGET_SDK_ARM + "')" +
               "and contains(@path, \"armeabi-v7a\")]");
-      else
+      } else if (abi.equals("arm64-v8a")) {
+    	expr = xpath.compile("//remotePackage[contains(@path, '" + AndroidBuild.TARGET_SDK + "')" +
+                  "and contains(@path, \"arm64-v8a\")]");  
+      } else {
         expr = xpath.compile("//remotePackage[contains(@path, '" + AndroidBuild.TARGET_SDK + "')" +
               "and contains(@path, \"x86\")]");
+      }
 
       if (wear) {
         Document docSysImgWear = db.parse(new URL(repositoryUrl).openStream());
@@ -561,4 +565,4 @@ public void actionPerformed(ActionEvent actionEvent) {
     setResizable(false);
     setLocationRelativeTo(editor);
   }
-}
+}