kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't freeze on 'adb devices' call on OS X

Browse Source
This commit is contained in:
Joshua Granick
2015-01-19 20:36:39 -08:00
parent d60887b739
commit b71df75953
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/helpers/AndroidHelper.hx
View File

@@ -282,7 +282,26 @@ class AndroidHelper {
public static function listDevices ():Array <String> { public static function listDevices ():Array <String> {
var devices = new Array <String> (); var devices = new Array <String> ();
var output = ProcessHelper.runProcess (adbPath, adbName, [ "devices" ]); var output = "";
if (PlatformHelper.hostPlatform == Platform.MAC) {
var tempFile = PathHelper.getTemporaryFile ();
ProcessHelper.runCommand (adbPath, adbName, [ "devices", ">", tempFile ], true, true);
if (FileSystem.exists (tempFile)) {
output = File.getContent (tempFile);
FileSystem.deleteFile (tempFile);
}
} else {
ProcessHelper.runCommand (adbPath, adbName, [ "devices" ], true, true);
}
if (output != null && output != "") { if (output != null && output != "") {