ANT_HOME and Linux ADB listDevices fix

This commit is contained in:
Joshua Granick
2015-01-28 12:30:48 -08:00
parent 49b7d08622
commit 5553c4529a
2 changed files with 21 additions and 5 deletions

View File

@@ -1147,19 +1147,35 @@ class CommandLineTools {
if (define == define.toUpperCase ()) {
var value = config.defines.get (define);
switch (define) {
case "ANT_HOME", "JAVA_HOME":
case "ANT_HOME":
if (FileSystem.exists (config.defines.get (define))) {
if (value == "/usr") {
Sys.putEnv (define, config.defines.get (define));
value = "/usr/share/ant";
}
if (FileSystem.exists (value)) {
Sys.putEnv (define, value);
}
case "JAVA_HOME":
if (FileSystem.exists (value)) {
Sys.putEnv (define, value);
}
default:
Sys.putEnv (define, config.defines.get (define));
Sys.putEnv (define, value);
}