download cmdline tools package

Author: codeanticode

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

@@ -79,8 +79,8 @@ public class SDKDownloader extends JDialog implements PropertyChangeListener {
 
   class SDKUrlHolder {
     public String platformVersion, buildToolsVersion;
-    public String platformToolsUrl, buildToolsUrl, platformUrl, toolsUrl, emulatorUrl;
-    public String platformToolsFilename, buildToolsFilename, platformFilename, toolsFilename, emulatorFilename;
+    public String platformToolsUrl, buildToolsUrl, platformUrl, cmdlineToolsUrl, emulatorUrl;
+    public String platformToolsFilename, buildToolsFilename, platformFilename, cmdlineToolsFilename, emulatorFilename;
     public String usbDriverUrl;
     public String usbDriverFilename;
     public String haxmFilename, haxmUrl;
@@ -128,9 +128,9 @@ protected Object doInBackground() throws Exception {
         getHaxmDownloadUrl(downloadUrls, haxmUrl, Platform.getName());
         firePropertyChange(AndroidMode.getTextString("download_property.change_event_total"), 0, downloadUrls.totalSize);
 
-        // tools
-        File downloadedTools = new File(tempFolder, downloadUrls.toolsFilename);
-        downloadAndUnpack(downloadUrls.toolsUrl, downloadedTools, sdkFolder, true);
+        // command-line tools
+        File downloadedCmdLineTools = new File(tempFolder, downloadUrls.cmdlineToolsFilename);
+        downloadAndUnpack(downloadUrls.cmdlineToolsUrl, downloadedCmdLineTools, sdkFolder, true);
 
         // platform-tools
         File downloadedPlatformTools = new File(tempFolder, downloadUrls.platformToolsFilename);
@@ -246,7 +246,7 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
       boolean found;
 
       // -----------------------------------------------------------------------
-      // platform
+      // Platform
       expr = xpath.compile("//remotePackage[starts-with(@path, \"platforms;\")" +
               "and contains(@path, '" + AndroidBuild.TARGET_SDK + "')]"); // Skip latest platform; download only the targeted
       remotePackages = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
@@ -271,12 +271,12 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
         throw new IOException(AndroidMode.getTextString("sdk_downloader.error_cannot_find_platform_files"));
       }
 
-      // Difference between platform tools, build tools, and SDK tools: 
+      // Difference between platform tools, build tools, and SDK (now command-line) tools: 
       // http://stackoverflow.com/questions/19911762/what-is-android-sdk-build-tools-and-which-version-should-be-used
       // Always get the latest!
 
       // -----------------------------------------------------------------------
-      // platform-tools
+      // Platform tools
       expr = xpath.compile("//remotePackage[@path=\"platform-tools\"]");
       remotePackages = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
       if (remotePackages != null) {
@@ -286,7 +286,7 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
       }
 
       // -----------------------------------------------------------------------
-      // build-tools
+      // Build tools
       expr = xpath.compile("//remotePackage[starts-with(@path, \"build-tools;\")]");
       remotePackages = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
       found = false;
@@ -332,14 +332,19 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
       }
 
       // -----------------------------------------------------------------------
-      // tools
-      expr = xpath.compile("//remotePackage[@path=\"tools\"]"); // Matches two items according to xml file
+      // Command-line tools
+//      expr = xpath.compile("//remotePackage[@path=\"cmdline-tools;\"]");
+      expr = xpath.compile("//remotePackage[starts-with(@path, \"cmdline-tools;\")]");      
       remotePackages = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
       found = false;
       if (remotePackages != null) {
         for (int tool = 0; tool < remotePackages.getLength(); tool++) {
           NodeList childNodes = remotePackages.item(tool).getChildNodes();
 
+          NodeList channel = ((Element) childNodes).getElementsByTagName("channelRef");
+          if(!channel.item(0).getAttributes().item(0).getNodeValue().equals("channel-0"))
+            continue; // Stable channel only, skip others          
+          
           NodeList archives = ((Element) childNodes).getElementsByTagName("archive");
           for (int i = 0; i < archives.getLength(); ++i) {
             NodeList archive = archives.item(i).getChildNodes();
@@ -350,45 +355,23 @@ private void getMainDownloadUrls(SDKUrlHolder urlHolder,
             NodeList size = ((Element) complete.item(0)).getElementsByTagName("size");
 
             if (os.item(0).getTextContent().equals(requiredHostOs)) {
-              urlHolder.toolsFilename =  url.item(0).getTextContent();
-              urlHolder.toolsUrl = REPOSITORY_URL + urlHolder.toolsFilename;
+              urlHolder.cmdlineToolsFilename =  url.item(0).getTextContent();
+              urlHolder.cmdlineToolsUrl = REPOSITORY_URL + urlHolder.cmdlineToolsFilename;
               urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
               found = true;
               break;
             }            
           }
           if (found) break;          
         }
-        
-//        NodeList childNodes = remotePackages.item(1).getChildNodes(); // Second item is the latest tools for now
-//        NodeList archives = ((Element) childNodes).getElementsByTagName("archive");
-//
-//        for (int i = 0; i < archives.getLength(); ++i) {
-//          NodeList archive = archives.item(i).getChildNodes();
-//          NodeList complete = ((Element) archive).getElementsByTagName("complete");
-//
-//          NodeList os = ((Element) archive).getElementsByTagName("host-os");
-//          NodeList url = ((Element) complete.item(0)).getElementsByTagName("url");
-//          NodeList size = ((Element) complete.item(0)).getElementsByTagName("size");
-//
-//          if (os.item(0).getTextContent().equals(requiredHostOs)) {
-//            urlHolder.toolsFilename =  url.item(0).getTextContent();
-//            urlHolder.toolsUrl = REPOSITORY_URL + urlHolder.toolsFilename;
-//            urlHolder.totalSize += Integer.parseInt(size.item(0).getTextContent());
-//            found = true;
-//            break;
-//          }
-//        }
-        
-        
       } 
       if (!found) {
         throw new IOException(AndroidMode.getTextString("sdk_downloader.error_cannot_find_tools"));
       }
 
       // -----------------------------------------------------------------------
-      // emulator
-      expr = xpath.compile("//remotePackage[@path=\"emulator\"]"); // Matches two items according to xml file
+      // Emulator
+      expr = xpath.compile("//remotePackage[@path=\"emulator\"]");
       remotePackages = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
       found = false;
       if (remotePackages != null) {