From 59bc0a0fce781298538ab4bd557c6068f69da4a4 Mon Sep 17 00:00:00 2001 From: Alexander Aprelev Date: Tue, 5 Sep 2017 11:12:15 -0700 Subject: [PATCH] Move host build check until it's actually used. (#11926) * Move host build check until it's actually used * Elaborate diagnostic message --- packages/flutter_tools/lib/src/compile.dart | 6 ++++++ .../lib/src/runner/flutter_command_runner.dart | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/flutter_tools/lib/src/compile.dart b/packages/flutter_tools/lib/src/compile.dart index 9c11d374c9..bf663f16d5 100644 --- a/packages/flutter_tools/lib/src/compile.dart +++ b/packages/flutter_tools/lib/src/compile.dart @@ -5,6 +5,7 @@ import 'dart:async'; import 'dart:convert'; +import 'package:flutter_tools/src/base/common.dart'; import 'package:flutter_tools/src/base/process_manager.dart'; import 'package:usage/uuid/uuid.dart'; @@ -18,6 +19,11 @@ String _dartExecutable() { final String engineDartSdkPath = artifacts.getArtifactPath( Artifact.engineDartSdkPath ); + if (!fs.isDirectorySync(engineDartSdkPath)) { + throwToolExit('No dart sdk Flutter host engine build found at $engineDartSdkPath.\n' + 'Note that corresponding host engine build is required even when targeting particular device platforms.', + exitCode: 2); + } return fs.path.join(engineDartSdkPath, 'bin', 'dart'); } diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart index dbdcb11a98..7f6f98c0fd 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart @@ -336,9 +336,6 @@ class FlutterCommandRunner extends CommandRunner { final String hostLocalEngine = 'host_' + localEngine.substring(localEngine.indexOf('_') + 1); final String engineHostBuildPath = fs.path.normalize(fs.path.join(enginePath, 'out', hostLocalEngine)); - if (!fs.isDirectorySync(engineHostBuildPath)) { - throwToolExit('No Flutter host engine build found at $engineHostBuildPath.', exitCode: 2); - } return new EngineBuildPaths(targetEngine: engineBuildPath, hostEngine: engineHostBuildPath); }