From 00f82d9021f1d9457570fd6cd7461fb7ad096b74 Mon Sep 17 00:00:00 2001
From: Emmanuel Garcia <egarciad@google.com>
Date: Thu, 3 Oct 2019 20:42:43 -0700
Subject: [PATCH] Use `mergeResourcesProvider` instead of deprecated
 `mergeResources` (#41942)

---
 packages/flutter_tools/gradle/flutter.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle
index c579db441f..98b90878b8 100644
--- a/packages/flutter_tools/gradle/flutter.gradle
+++ b/packages/flutter_tools/gradle/flutter.gradle
@@ -645,7 +645,9 @@ class FlutterPlugin implements Plugin<Project> {
                 into mergeAssets.outputDir
             }
             if (!isUsedAsSubproject) {
-                variant.mergeResources.dependsOn(copyFlutterAssetsTask)
+                def mergeResources = variant.hasProperty("mergeResourcesProvider") ?
+                    variant.mergeResourcesProvider.get() : variant.mergeResources
+                mergeResources.dependsOn(copyFlutterAssetsTask)
                 return
             }
             // Flutter module included as a subproject in add to app.