File tree Expand file tree Collapse file tree 3 files changed +3
-11
lines changed Expand file tree Collapse file tree 3 files changed +3
-11
lines changed Original file line number Diff line number Diff line change @@ -43,12 +43,6 @@ interface IDebugOptions {
43
43
*/
44
44
stop ?: boolean ;
45
45
46
- // TODO: remove
47
- /**
48
- * Defines if debug process is for emulator (not for real device).
49
- */
50
- emulator ?: boolean ;
51
-
52
46
/**
53
47
* Defines if the debug process should break on the first line.
54
48
*/
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ export class AndroidDebugService extends DebugServiceBase implements IPlatformDe
26
26
27
27
public async debug ( debugData : IDebugData , debugOptions : IDebugOptions ) : Promise < string > {
28
28
this . _packageName = debugData . applicationIdentifier ;
29
- const result = debugOptions . emulator
29
+ const result = this . device . isEmulator
30
30
? await this . debugOnEmulator ( debugData , debugOptions )
31
31
: await this . debugOnDevice ( debugData , debugOptions ) ;
32
32
@@ -108,7 +108,7 @@ export class AndroidDebugService extends DebugServiceBase implements IPlatformDe
108
108
private async debugOnDevice ( debugData : IDebugData , debugOptions : IDebugOptions ) : Promise < string > {
109
109
let packageFile = "" ;
110
110
111
- if ( ! debugOptions . start && ! debugOptions . emulator ) {
111
+ if ( ! debugOptions . start && ! this . device . isEmulator ) {
112
112
packageFile = debugData . pathToAppPackage ;
113
113
this . $logger . out ( "Using " , packageFile ) ;
114
114
}
Original file line number Diff line number Diff line change @@ -57,9 +57,7 @@ export class DebugService extends EventEmitter implements IDebugService {
57
57
this . $errors . failWithoutHelp ( "To debug on iOS simulator you need to provide path to the app package." ) ;
58
58
}
59
59
60
- if ( this . $hostInfo . isWindows ) {
61
- debugOptions . emulator = false ;
62
- } else if ( ! this . $hostInfo . isDarwin ) {
60
+ if ( ! this . $hostInfo . isWindows && ! this . $hostInfo . isDarwin ) {
63
61
this . $errors . failWithoutHelp ( `Debugging on iOS devices is not supported for ${ platform ( ) } yet.` ) ;
64
62
}
65
63
}
You can’t perform that action at this time.
0 commit comments