From c79db8c41eee2c1fea559d4711e6dc3dc0db09ac Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Tue, 28 Jul 2015 09:03:11 -0700
Subject: [PATCH 1/2] Load SkyX files on iOS where available

---
 .../src/flutter/build/config/ios/ios_app.py   | 28 +++++++++++--------
 engine/src/flutter/build/config/ios/rules.gni | 10 +++++--
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/engine/src/flutter/build/config/ios/ios_app.py b/engine/src/flutter/build/config/ios/ios_app.py
index fa86c7acf1..044d597ccb 100644
--- a/engine/src/flutter/build/config/ios/ios_app.py
+++ b/engine/src/flutter/build/config/ios/ios_app.py
@@ -15,9 +15,25 @@ PLUTIL = [
   'plutil'
 ]
 
+def MakeDirectories(path):
+  try:
+    os.makedirs(path)
+  except OSError as exc:
+    if exc.errno == errno.EEXIST and os.path.isdir(path):
+      return 0
+    else:
+      return -1
+
+  return 0
+
 
 def ProcessInfoPlist(args):
   output_plist_file = os.path.abspath(os.path.join(args.output, 'Info.plist'))
+
+  print os.path.dirname(output_plist_file)
+  if MakeDirectories(os.path.dirname(output_plist_file)) == -1:
+    return -1
+
   return subprocess.check_call( PLUTIL + [
     '-convert',
     'binary1',
@@ -42,18 +58,6 @@ def PerformCodeSigning(args):
   ])
 
 
-def MakeDirectories(path):
-  try:
-    os.makedirs(path)
-  except OSError as exc:
-    if exc.errno == errno.EEXIST and os.path.isdir(path):
-      return 0
-    else:
-      return -1
-
-  return 0
-
-
 def GenerateProjectStructure(args):
   application_path = os.path.join( args.dir, args.name + ".app" )
   return MakeDirectories( application_path )
diff --git a/engine/src/flutter/build/config/ios/rules.gni b/engine/src/flutter/build/config/ios/rules.gni
index 003226287b..caf8eb2df4 100644
--- a/engine/src/flutter/build/config/ios/rules.gni
+++ b/engine/src/flutter/build/config/ios/rules.gni
@@ -56,6 +56,10 @@ template("resource_copy_ios") {
     set_sources_assignment_filter([])
     sources = _resources
     outputs = [ "$root_build_dir/$_app_name.app/$_bundle_directory/{{source_file_part}}" ]
+
+    if (defined(invoker.deps)) {
+      deps = invoker.deps
+    }
   }
 }
 
@@ -115,14 +119,14 @@ template("ios_app") {
     script = ios_app_script
 
     sources = [ invoker.info_plist ]
-    outputs = [ "$root_build_dir/Info.plist" ]
+    outputs = [ "$root_build_dir/plist/$app_name/Info.plist" ]
 
     args = [
       "plist",
       "-i",
       rebase_path(invoker.info_plist, root_build_dir),
       "-o",
-      rebase_path(root_build_dir),
+      rebase_path("$root_build_dir/plist/$app_name"),
     ]
   }
 
@@ -131,7 +135,7 @@ template("ios_app") {
   copy_gen_target_name = target_name + "_copy"
   copy(copy_gen_target_name) {
     sources = [
-      "$root_build_dir/Info.plist",
+      "$root_build_dir/plist/$app_name/Info.plist",
       "$root_build_dir/$app_name",
     ]
 

From ba51fa22ff0086c60e8d4e4d5fe34880c160eb53 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@google.com>
Date: Tue, 28 Jul 2015 12:57:53 -0700
Subject: [PATCH 2/2] Address PR feedback on updates for SkyX for iOS

---
 engine/src/flutter/build/config/ios/ios_app.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engine/src/flutter/build/config/ios/ios_app.py b/engine/src/flutter/build/config/ios/ios_app.py
index 044d597ccb..0045c360de 100644
--- a/engine/src/flutter/build/config/ios/ios_app.py
+++ b/engine/src/flutter/build/config/ios/ios_app.py
@@ -30,7 +30,6 @@ def MakeDirectories(path):
 def ProcessInfoPlist(args):
   output_plist_file = os.path.abspath(os.path.join(args.output, 'Info.plist'))
 
-  print os.path.dirname(output_plist_file)
   if MakeDirectories(os.path.dirname(output_plist_file)) == -1:
     return -1