zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

Merge pull request #148 from alhaad/update_run_mojo_command

Browse Source 
Modify run_mojo command to take path to devtools.
This commit is contained in:
Adam Barth
2015-10-29 16:22:36 -07:00
parent 5f742b70ba dde6bd2034
commit 6e076a3522
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/flutter_tools/lib/src/commands/run_mojo.dart
View File

@@ -27,7 +27,7 @@ class RunMojoCommand extends Command {
argParser.addFlag('mojo-release', negatable: false, help: 'Use Release build of mojo (default)');
argParser.addOption('app', defaultsTo: 'app.flx');
argParser.addOption('mojo-path', help: 'Path to directory containing mojo_shell and services');
argParser.addOption('mojo-path', help: 'Path to directory containing mojo_shell and services for Linux and to mojo devtools from Android.');
}
// TODO(abarth): Why not use path.absolute?
@@ -39,9 +39,9 @@ class RunMojoCommand extends Command {
return file.absolute.path;
}
Future<int> _runAndroid(String mojoPath, _MojoConfig mojoConfig, String appPath, List<String> additionalArgs) {
Future<int> _runAndroid(String devtoolsPath, _MojoConfig mojoConfig, String appPath, List<String> additionalArgs) {
String skyViewerUrl = ArtifactStore.googleStorageUrl('viewer', 'android-arm');
String command = _makePathAbsolute(path.join(mojoPath, 'mojo', 'devtools', 'common', 'mojo_run'));
String command = _makePathAbsolute(devtoolsPath);
String appName = path.basename(appPath);
String appDir = path.dirname(appPath);
String buildFlag = mojoConfig == _MojoConfig.Debug ? '--debug' : '--release';
@@ -80,9 +80,10 @@ class RunMojoCommand extends Command {
@override
Future<int> run() async {
if (argResults['mojo-path'] == null) {
_logging.severe('Must specify --mojo-path to mojo_run');
_logging.severe('Must specify --mojo-path.');
return 1;
}
if (argResults['mojo-debug'] && argResults['mojo-release']) {
_logging.severe('Cannot specify both --mojo-debug and --mojo-release');
return 1;