From a2296aa8e3b0661999670accf4e2b9501fe354a7 Mon Sep 17 00:00:00 2001
From: Mikkel Nygaard Ravn <mravn@google.com>
Date: Thu, 14 Dec 2017 11:38:20 +0100
Subject: [PATCH] Simplify project template (#13558)

---
 packages/flutter_tools/gradle/flutter.gradle                   | 3 +++
 .../templates/create/android-java.tmpl/app/build.gradle.tmpl   | 3 ---
 .../templates/create/android-kotlin.tmpl/app/build.gradle.tmpl | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle
index 9bab2a89e8..b466a420fa 100644
--- a/packages/flutter_tools/gradle/flutter.gradle
+++ b/packages/flutter_tools/gradle/flutter.gradle
@@ -74,6 +74,9 @@ class FlutterPlugin implements Plugin<Project> {
         project.android.buildTypes {
             profile {
                 initWith debug
+                if (it.hasProperty('matchingFallbacks')) {
+                    matchingFallbacks = ['debug', 'release']
+                }
             }
         }
 
diff --git a/packages/flutter_tools/templates/create/android-java.tmpl/app/build.gradle.tmpl b/packages/flutter_tools/templates/create/android-java.tmpl/app/build.gradle.tmpl
index 07cddd4557..5aa7493e99 100644
--- a/packages/flutter_tools/templates/create/android-java.tmpl/app/build.gradle.tmpl
+++ b/packages/flutter_tools/templates/create/android-java.tmpl/app/build.gradle.tmpl
@@ -38,9 +38,6 @@ android {
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
         }
-        profile {
-            matchingFallbacks = ['debug', 'release']
-        }
     }
 }
 
diff --git a/packages/flutter_tools/templates/create/android-kotlin.tmpl/app/build.gradle.tmpl b/packages/flutter_tools/templates/create/android-kotlin.tmpl/app/build.gradle.tmpl
index 99f8ebf8a7..f093a399e2 100644
--- a/packages/flutter_tools/templates/create/android-kotlin.tmpl/app/build.gradle.tmpl
+++ b/packages/flutter_tools/templates/create/android-kotlin.tmpl/app/build.gradle.tmpl
@@ -43,9 +43,6 @@ android {
             // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.debug
         }
-        profile {
-            matchingFallbacks = ['debug', 'release']
-        }
     }
 }