Merge pull request simpligility#205 from Shusshu/issue-sdk-structure

Fix for the new SDK structure
hborders · May 15, 2013 · b880165 · b880165
2 parents 0925013 + da8a70c
commit b880165
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/com/jayway/maven/plugins/android/AndroidSdk.java b/src/main/java/com/jayway/maven/plugins/android/AndroidSdk.java
@@ -182,7 +182,10 @@ public String getPathForTool( String tool )
                 sdkPath + "/" + PLATFORM_TOOLS_FOLDER_NAME + "/lib/" + tool, getPlatform() + "/tools/" + tool,
                 getPlatform() + "/tools/" + tool + ".exe", getPlatform() + "/tools/" + tool + ".bat",
                 getPlatform() + "/tools/lib/" + tool, sdkPath + "/tools/" + tool, sdkPath + "/tools/" + tool + ".exe",
-                sdkPath + "/tools/" + tool + ".bat", sdkPath + "/tools/lib/" + tool };
+                sdkPath + "/tools/" + tool + ".bat", sdkPath + "/tools/lib/" + tool,
+                sdkPath + "/build-tools/17.0.0/" + tool, 
+                sdkPath + "/build-tools/17.0.0/" + tool + ".bat",
+                sdkPath + "/build-tools/17.0.0/" + tool + ".exe"};
 
         for ( String possiblePath : possiblePaths )
         {