From 01104e7fa42ca8f0d60ac5e23d624262cc0f2e5e Mon Sep 17 00:00:00 2001
From: Kane O'Riley <lennykano@gmail.com>
Date: Sun, 2 Aug 2015 01:40:41 +0930
Subject: [PATCH] Fix preview build tools availability check and download

---
 .../sdkmanager/internal/PackageResolver.groovy           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/groovy/com/jakewharton/sdkmanager/internal/PackageResolver.groovy b/src/main/groovy/com/jakewharton/sdkmanager/internal/PackageResolver.groovy
index 9d60eb3..c77f611 100644
--- a/src/main/groovy/com/jakewharton/sdkmanager/internal/PackageResolver.groovy
+++ b/src/main/groovy/com/jakewharton/sdkmanager/internal/PackageResolver.groovy
@@ -71,7 +71,12 @@ class PackageResolver {
     def buildToolsRevision = project.android.buildToolsRevision
     log.debug "Build tools version: $buildToolsRevision"
 
-    def buildToolsRevisionDir = new File(buildToolsDir, buildToolsRevision.toString())
+    def buildToolsRevisionName = buildToolsRevision.toString()
+    if (buildToolsRevisionName.contains(" rc")) {
+      // Fix folder name for preview build tools
+      buildToolsRevisionName = buildToolsRevisionName.replaceAll(" rc.*", "-preview")
+    }
+    def buildToolsRevisionDir = new File(buildToolsDir, buildToolsRevisionName)
     if (folderExists(buildToolsRevisionDir)) {
       log.debug 'Build tools found!'
       return
@@ -79,7 +84,7 @@ class PackageResolver {
 
     log.lifecycle "Build tools $buildToolsRevision missing. Downloading..."
 
-    def code = androidCommand.update "build-tools-$buildToolsRevision"
+    def code = androidCommand.update "build-tools-$buildToolsRevisionName"
     if (code != 0) {
       throw new StopExecutionException("Build tools download failed with code $code.")
     }