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

Make getDeviceSDKVersion more resiliennt for ADB

Browse Source
This commit is contained in:
Joshua Granick
2015-01-08 15:02:53 -08:00
parent 7a3617fc78
commit ec283d01f9
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/helpers/AndroidHelper.hx
View File

@@ -5,6 +5,7 @@ import helpers.LogHelper;
import helpers.ProcessHelper;
import project.HXProject;
import project.Platform;
import sys.io.File;
import sys.FileSystem;
@@ -85,7 +86,9 @@ class AndroidHelper {
ProcessHelper.runCommand (adbPath, adbName, [ "kill-server" ]);
ProcessHelper.runCommand (adbPath, adbName, [ "start-server" ]);
var args = [ "wait-for-device", "shell", "getprop", "ro.build.version.sdk" ];
var tempFile = PathHelper.getTemporaryFile ();
var args = [ "wait-for-device", "shell", "getprop", "ro.build.version.sdk", ">", tempFile ];
if (deviceID != null && deviceID != "") {
@@ -96,9 +99,17 @@ class AndroidHelper {
}
var output = ProcessHelper.runProcess (adbPath, adbName, args);
return Std.parseInt (output);
ProcessHelper.runCommand (adbPath, adbName, args);
if (FileSystem.exists (tempFile)) {
var output = File.getContent (tempFile);
FileSystem.deleteFile (tempFile);
return Std.parseInt (output);
}
return 0;
}