Gyp changes for ninja iOS build.

build/ios/mac_build.gypi

Index: build/ios/mac_build.gypi
diff --git a/build/ios/mac_build.gypi b/build/ios/mac_build.gypi
index dd5ad1d24948465fba6882cb08bce8ae47502c44..e0fdd4002aa62a30384d630437758e2bddcd2df2 100644
--- a/build/ios/mac_build.gypi
+++ b/build/ios/mac_build.gypi
@@ -39,6 +39,17 @@
 # }
 {
   'variables': {
+    'variables': {
+      'conditions' : [
+        ['"<(GENERATOR)"=="ninja"', {
+          'include_dir': '<(DEPTH)/out/<(CONFIGURATION_NAME)/gen',
+        }, {
+          'include_dir': '<(DEPTH)/xcodebuild/DerivedSources/<(CONFIGURATION_NAME)',
+        }],
+      ],
+    },
+    'include_dir%': '<(include_dir)',
+    },

[Mark Mentovai, 2013/05/02 13:19:22]

This line doesn’t belong.

[justincohen, 2013/05/02 13:21:41]

Done.

     # Common ninja command line flags.
     'ninja_cmd': [
       # Bounce through clean_env to clean up the environment so things
@@ -67,6 +78,7 @@
       '-Dios_mac_build=1',
       # Pass through the Mac SDK version.
       '-Dmac_sdk=<(mac_sdk)',
+      '-Dinclude_dir=<(include_dir)'
     ],
 
     # Rerun gyp for each of the projects needed. This is what actually