Gyp changes for ninja iOS build.

Various tweaks to make ninja happy with our gyp files.
ninja iOS builds don't CODE_SIGN yet.
ninja only supports i386/simulator for now.
pass parent_generator to mac_build.gypi for iOS sub-ninja builds

BUG=236517

Review URL: https://chromiumcodereview.appspot.com/14577007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198084 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 30 insertions, 13 deletions

diff --git a/build/common.gypi b/build/common.gypi
index ba2a861..a829d21 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4032,17 +4032,22 @@
                 },
               },
             },
-            'xcode_settings': {
-              'conditions': [
-                ['chromium_ios_signing', {
-                  # iOS SDK wants everything for device signed.
-                  'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
-                }, {
-                  'CODE_SIGNING_REQUIRED': 'NO',
-                  'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
-                }],
-              ],
-            },
+            'conditions': [
+              # TODO(justincohen): ninja builds don't support signing yet.
+              ['"<(GENERATOR)"!="ninja"', {
+                'xcode_settings': {
+                  'conditions': [
+                    ['chromium_ios_signing', {
+                      # iOS SDK wants everything for device signed.
+                      'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer',
+                    }, {
+                      'CODE_SIGNING_REQUIRED': 'NO',
+                      'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
+                    }],
+                  ],
+                },
+              }],
+            ],
           }],
         ],  # target_conditions
       },  # target_defaults
@@ -4391,7 +4396,14 @@
       ['OS=="ios"', {
         'conditions': [
           ['ios_sdk_path==""', {
-            'SDKROOT': 'iphoneos<(ios_sdk)',  # -isysroot
+            'conditions': [
+              # TODO(justincohen): Ninja only supports simulator for now.
+              ['"<(GENERATOR)"=="ninja"', {
+                'SDKROOT': 'iphonesimulator<(ios_sdk)',  # -isysroot
+              }, {
+                'SDKROOT': 'iphoneos<(ios_sdk)',  # -isysroot
+              }],
+            ],
           }, {
             'SDKROOT': '<(ios_sdk_path)',  # -isysroot
           }],
diff --git a/build/ios/mac_build.gypi b/build/ios/mac_build.gypi
index dd5ad1d..cbdbc79 100644
--- a/build/ios/mac_build.gypi
+++ b/build/ios/mac_build.gypi
@@ -39,6 +39,10 @@
 # }
 {
   'variables': {
+    'variables': {
+     'parent_generator%': '<(GENERATOR)',
+    },
+    'parent_generator%': '<(parent_generator)',
     # Common ninja command line flags.
     'ninja_cmd': [
       # Bounce through clean_env to clean up the environment so things
@@ -67,6 +71,7 @@
       '-Dios_mac_build=1',
       # Pass through the Mac SDK version.
       '-Dmac_sdk=<(mac_sdk)',
+      '-Dparent_generator=<(parent_generator)'
     ],
 
     # Rerun gyp for each of the projects needed. This is what actually
diff --git a/build/landmines.py b/build/landmines.py
index 7061ed5..5187b0d 100755
--- a/build/landmines.py
+++ b/build/landmines.py
@@ -167,7 +167,7 @@ def get_target_build_dir(build_tool, target, is_iphone=False):
         target + ('-iphoneos' if is_iphone else ''))
   elif build_tool == 'make':
     ret = os.path.join(SRC_DIR, 'out', target)
-  elif build_tool == 'ninja':
+  elif build_tool in ['ninja', 'ninja-ios']:
     ret = os.path.join(SRC_DIR, 'out', target)
   elif build_tool in ['msvs', 'vs', 'ib']:
     ret = os.path.join(SRC_DIR, 'build', target)