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

ADB fix, treat Firefox as type WEB not MOBILE, it may be for desktop or mobile Firefox browsers

Browse Source
This commit is contained in:
Joshua Granick
2014-11-21 16:10:43 -08:00
parent eb3c804625
commit 8b3824724e
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/helpers/AndroidHelper.hx
View File

@@ -81,7 +81,8 @@ class AndroidHelper {
public static function getDeviceSDKVersion (deviceID:String):Int { public static function getDeviceSDKVersion (deviceID:String):Int {
ProcessHelper.runCommand (adbPath, adbName, [ "devices" ]); ProcessHelper.runCommand (adbPath, adbName, [ "kill-server" ]);
ProcessHelper.runCommand (adbPath, adbName, [ "start-server" ]);
var args = [ "shell" ]; var args = [ "shell" ];

13
tools/project/HXProject.hx
View File

@@ -129,7 +129,7 @@ class HXProject {
platformType = PlatformType.WEB; platformType = PlatformType.WEB;
architectures = []; architectures = [];
case HTML5, EMSCRIPTEN: case HTML5, FIREFOX, EMSCRIPTEN:
platformType = PlatformType.WEB; platformType = PlatformType.WEB;
architectures = []; architectures = [];
@@ -138,15 +138,6 @@ class HXProject {
defaultWindow.height = 0; defaultWindow.height = 0;
defaultWindow.fps = 0; defaultWindow.fps = 0;
case FIREFOX:
platformType = PlatformType.MOBILE;
architectures = [];
defaultWindow.width = 0;
defaultWindow.height = 0;
defaultWindow.fps = 0;
case ANDROID, BLACKBERRY, IOS, TIZEN, WEBOS: case ANDROID, BLACKBERRY, IOS, TIZEN, WEBOS:
platformType = PlatformType.MOBILE; platformType = PlatformType.MOBILE;
@@ -901,7 +892,7 @@ class HXProject {
if (asset.embed == null) { if (asset.embed == null) {
embeddedAsset.embed = (platformType == PlatformType.WEB || target == Platform.FIREFOX); embeddedAsset.embed = (platformType == PlatformType.WEB);
} }