commit 6a63af4081c3a79d334178c5ef54064f814fd9b2
author John McCutchan <john@johnmccutchan.com> Tue Jan 10 07:59:55 2017 -0800
committer GitHub <noreply@github.com> Tue Jan 10 07:59:55 2017 -0800
tree 2e0959bf6797a237f6d7afa3229f257b128be06c
parent 684259794ba5ef9316e02d6d93cf5144bdfb566d

Rebuild Android apk when Dart source is modified (#7345)

- [x] Wire up dependency checker and plumb flags down to the right place

Fixes #7014

packages/flutter_tools/lib/src/run.dart

diff --git a/packages/flutter_tools/lib/src/run.dart b/packages/flutter_tools/lib/src/run.dart
index 4465f21..3d5023b 100644
--- a/packages/flutter_tools/lib/src/run.dart
+++ b/packages/flutter_tools/lib/src/run.dart
@@ -29,8 +29,6 @@
              debuggingOptions: debuggingOptions,
              usesTerminalUI: usesTerminalUI);
 
-  ApplicationPackage _package;
-  String _mainPath;
   LaunchResult _result;
   final bool traceStartup;
   final String applicationBinary;
@@ -46,7 +44,6 @@
   }) {
     // Don't let uncaught errors kill the process.
     return Chain.capture(() {
-      assert(shouldBuild == !prebuiltMode);
       return _run(
         traceStartup: traceStartup,
         connectionInfoCompleter: connectionInfoCompleter,
@@ -67,9 +64,8 @@
     bool shouldBuild: true
   }) async {
     if (!prebuiltMode) {
-      _mainPath = findMainDartFile(target);
-      if (!fs.isFileSync(_mainPath)) {
-        String message = 'Tried to run $_mainPath, but that file does not exist.';
+      if (!fs.isFileSync(mainPath)) {
+        String message = 'Tried to run $mainPath, but that file does not exist.';
         if (target == null)
           message += '\nConsider using the -t option to specify the Dart file to start.';
         printError(message);
@@ -77,9 +73,9 @@
       }
     }
 
-    _package = getApplicationPackageForPlatform(device.platform, applicationBinary: applicationBinary);
+    package = getApplicationPackageForPlatform(device.platform, applicationBinary: applicationBinary);
 
-    if (_package == null) {
+    if (package == null) {
       String message = 'No application found for ${device.platform}.';
       String hint = getMissingPackageHintForPlatform(device.platform);
       if (hint != null)
@@ -94,24 +90,25 @@
     if (traceStartup != null)
       platformArgs = <String, dynamic>{ 'trace-startup': traceStartup };
 
-    await startEchoingDeviceLog(_package);
+    await startEchoingDeviceLog(package);
 
     String modeName = getModeName(debuggingOptions.buildMode);
-    if (_mainPath == null) {
+    if (mainPath == null) {
       assert(prebuiltMode);
-      printStatus('Launching ${_package.displayName} on ${device.name} in $modeName mode...');
+      printStatus('Launching ${package.displayName} on ${device.name} in $modeName mode...');
     } else {
-      printStatus('Launching ${getDisplayPath(_mainPath)} on ${device.name} in $modeName mode...');
+      printStatus('Launching ${getDisplayPath(mainPath)} on ${device.name} in $modeName mode...');
     }
 
     _result = await device.startApp(
-      _package,
+      package,
       debuggingOptions.buildMode,
-      mainPath: _mainPath,
+      mainPath: mainPath,
       debuggingOptions: debuggingOptions,
       platformArgs: platformArgs,
       route: route,
-      prebuiltApplication: prebuiltMode
+      prebuiltApplication: prebuiltMode,
+      applicationNeedsRebuild: shouldBuild || hasDirtyDependencies()
     );
 
     if (!_result.started) {
@@ -195,6 +192,6 @@
   Future<Null> preStop() async {
     // If we're running in release mode, stop the app using the device logic.
     if (vmService == null)
-      await device.stopApp(_package);
+      await device.stopApp(package);
   }
 }