From f86bdf1aa27b74e780bcae9e8ecdfaa11ec5ea7a Mon Sep 17 00:00:00 2001
From: Jacob Richman <jacobr@google.com>
Date: Wed, 17 Oct 2018 07:39:20 -0700
Subject: [PATCH] Fix bug where gradle build rule would rerun on switching from
 (#23183)

--track-widget-creation=false to
--track-widget-creation=true
but not when switching from
--track-widget-creation=true
to
--track-widget-creation=false

due to the surprising behavior of Gradle @Optional inputs.
---
 packages/flutter_tools/gradle/flutter.gradle       | 2 +-
 packages/flutter_tools/lib/src/android/gradle.dart | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle
index a2799c0c58..43d6e2e849 100644
--- a/packages/flutter_tools/gradle/flutter.gradle
+++ b/packages/flutter_tools/gradle/flutter.gradle
@@ -418,7 +418,7 @@ abstract class BaseFlutterTask extends DefaultTask {
     String[] fileSystemRoots
     @Optional @Input
     String fileSystemScheme
-    @Optional @Input
+    @Input
     Boolean trackWidgetCreation
     @Optional @Input
     String compilationTraceFilePath
diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart
index 746cadb3ec..def75ad61e 100644
--- a/packages/flutter_tools/lib/src/android/gradle.dart
+++ b/packages/flutter_tools/lib/src/android/gradle.dart
@@ -365,8 +365,8 @@ Future<void> _buildGradleProjectV2(
   if (target != null) {
     command.add('-Ptarget=$target');
   }
-  if (buildInfo.trackWidgetCreation)
-    command.add('-Ptrack-widget-creation=true');
+  assert(buildInfo.trackWidgetCreation != null);
+  command.add('-Ptrack-widget-creation=${buildInfo.trackWidgetCreation}');
   if (buildInfo.compilationTraceFilePath != null)
     command.add('-Pprecompile=${buildInfo.compilationTraceFilePath}');
   if (buildInfo.buildHotUpdate)