Merge pull request #44 from bigdavedev/master

[FIXED JENKINS-23134] Replace File.separator with "/". Fixes inability to launch Android tools on Unix slaves from a Windows master.
jenkinsci · Jan 22, 2015 · 98d2a53 · 98d2a53
2 parents a0589ce + 28f76bb
commit 98d2a53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/android_emulator/sdk/DefaultToolLocator.java b/src/main/java/hudson/plugins/android_emulator/sdk/DefaultToolLocator.java
@@ -4,6 +4,6 @@
 
 public class DefaultToolLocator implements ToolLocator {
     public String findInSdk(AndroidSdk androidSdk, Tool tool) {
-        return File.separator + "tools" + File.separator;
+        return "/tools/";
     }
 }
diff --git a/src/main/java/hudson/plugins/android_emulator/sdk/PlatformToolLocator.java b/src/main/java/hudson/plugins/android_emulator/sdk/PlatformToolLocator.java
@@ -4,7 +4,7 @@
 import java.io.File;
 
 public class PlatformToolLocator implements ToolLocator {
-    private static final String BUILD_TOOLS_PATH = File.separator + "build-tools" + File.separator;
+    private static final String BUILD_TOOLS_PATH = "/build-tools/";
 
     public String findInSdk(AndroidSdk androidSdk, Tool tool) throws SdkInstallationException {
         if (tool == Tool.AAPT) {
@@ -15,14 +15,14 @@ public String findInSdk(AndroidSdk androidSdk, Tool tool) throws SdkInstallation
                 return getFirstInstalledBuildToolsDir(subDirs);
             }
         }
-        return File.separator + "platform-tools" + File.separator;
+        return "/platform-tools/";
 
     }
 
     private String getFirstInstalledBuildToolsDir(String[] buildToolsDirs) throws SdkInstallationException {
         if (buildToolsDirs.length == 0) {
             throw new SdkInstallationException("Please install at least one set of build-tools.");
         }
-        return BUILD_TOOLS_PATH + buildToolsDirs[0] + File.separator;
+        return BUILD_TOOLS_PATH + buildToolsDirs[0] + "/";
     }
 }