From dd789e645b33c42e123bba6a7f9ef16706df334d Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Thu, 18 Oct 2018 20:44:38 -0700
Subject: [PATCH] Handle escaped spaces in deps-file. (#23273)

---
 packages/flutter_tools/gradle/flutter.gradle | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle
index 43d6e2e8492..cca052b6c1f 100644
--- a/packages/flutter_tools/gradle/flutter.gradle
+++ b/packages/flutter_tools/gradle/flutter.gradle
@@ -581,9 +581,13 @@ class FlutterTask extends BaseFlutterTask {
         if (dependenciesFile.exists()) {
             try {
                 // Dependencies file has Makefile syntax:
-                //   <target> <files>: <source> <files> <separated> <by> <space>
+                //   <target> <files>: <source> <files> <separated> <by> <non-escaped space>
                 String depText = dependenciesFile.text
-                return project.files(depText.split(': ')[1].split())
+                // So we split list of files by non-escaped(by backslash) space,
+                def matcher = depText.split(': ')[1] =~ /(\\ |[^\s])+/
+                // then we replace all escaped spaces with regular spaces
+                def depList = matcher.collect{it[0].replaceAll("\\\\ ", " ")}
+                return project.files(depList)
             } catch (Exception e) {
                 logger.error("Error reading dependency file ${dependenciesFile}: ${e}")
             }