Basic device support for ninja iOS builds.

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 4143 matching lines @@
             # Match OS X clang C++11 warning settings.
             '-Wno-c++11-narrowing',
             '-Wno-reserved-user-defined-literal',
           ],
         },
         'target_conditions': [
           ['_toolset=="host"', {
             'xcode_settings': {
               'SDKROOT': 'macosx<(mac_sdk)',  # -isysroot
               'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
+              'ARCHS': ['i386'],

[Nico, 2013/07/18 00:29:08]

Don't you want to use 64 bit host binaries?

[justincohen, 2013/07/18 02:04:09]

Done.

             },
           }],
           ['_toolset=="target"', {
             'xcode_settings': {
               # This section should be for overriding host settings. But,
               # since we can't negate the iphone deployment target above, we
               # instead set it here for target only.
               'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
             },
+            'conditions': [
+              ['target_arch=="armv7"', {
+                'xcode_settings': { 'ARCHS': [ 'armv7' ]},
+              }, {
+                'xcode_settings': { 'ARCHS': [ 'i386' ] },

[Nico, 2013/07/18 00:29:08]

is this block needed?

[justincohen, 2013/07/18 02:04:09]

Yes, we still need to set the target to i386 for simulator builds.

On 2013/07/18 00:29:08, Nico wrote:

+              }],
+            ],
           }],
           ['_type=="executable"', {
             'configurations': {
               'Release_Base': {
                 'xcode_settings': {
                   'DEPLOYMENT_POSTPROCESSING': 'YES',
                   'STRIP_INSTALLED_PRODUCT': 'YES',
                 },
               },
               'Debug_Base': {
@@ skipping 422 matching lines @@
           }, {
             'SDKROOT': '<(mac_sdk_path)',  # -isysroot
           }],
         ],
       }],
       ['OS=="ios"', {
         'conditions': [
           ['ios_sdk_path==""', {
             'conditions': [
               # TODO(justincohen): Ninja only supports simulator for now.
-              ['"<(GENERATOR)"=="ninja"', {
+              ['"<(GENERATOR)"=="xcode" or ("<(GENERATOR)"=="ninja" and target_arch=="armv7")', {
+                'SDKROOT': 'iphoneos<(ios_sdk)',  # -isysroot
+              }, {
                 'SDKROOT': 'iphonesimulator<(ios_sdk)',  # -isysroot
-              }, {
-                'SDKROOT': 'iphoneos<(ios_sdk)',  # -isysroot
               }],
             ],
           }, {
             'SDKROOT': '<(ios_sdk_path)',  # -isysroot
           }],
         ],
       }],
       ['OS=="ios"', {
         # Just build armv7, until armv7s is correctly tested.
         'VALID_ARCHS': 'armv7 i386',
         # Target both iPhone and iPad.
         'TARGETED_DEVICE_FAMILY': '1,2',
       }],
+      ['OS=="ios" and "<(GENERATOR)"!="ninja"', {
+        'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)',
+      }],
       ['target_arch=="x64"', {
         'ARCHS': [
           'x86_64'
          ],
       }],
     ],
 
     # The Xcode generator will look for an xcode_settings section at the root
     # of each dict and use it to apply settings on a file-wide basis.  Most
     # settings should not be here, they should be in target-specific
     # xcode_settings sections, or better yet, should use non-Xcode-specific
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }