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

Simplify Android SDK check

Browse Source
This commit is contained in:
Joshua Granick
2014-11-21 18:55:24 -08:00
parent 8b3824724e
commit a59f419c06
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/helpers/AndroidHelper.hx
View File

@@ -81,10 +81,7 @@ class AndroidHelper {
public static function getDeviceSDKVersion (deviceID:String):Int {
ProcessHelper.runCommand (adbPath, adbName, [ "kill-server" ]);
ProcessHelper.runCommand (adbPath, adbName, [ "start-server" ]);
var args = [ "shell" ];
var args = [ "wait-for-device", "shell", "getprop", "ro.build.version.sdk" ];
if (deviceID != null && deviceID != "") {
@@ -95,19 +92,8 @@ class AndroidHelper {
}
args = args.concat ([ "grep", "ro.build.version.sdk=", "system/build.prop" ]);
var output = ProcessHelper.runProcess (adbPath, adbName, args);
var search = "ro.build.version.sdk=";
var index = output.indexOf (search);
if (index > -1) {
return Std.parseInt (output.substring (index + search.length));
}
return -1;
return Std.parseInt (output);
}