Changes to build/common.gypi for iOS.

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 454 matching lines @@
           'proprietary_codecs%': 1,
           'remoting%': 0,
         }],
 
         ['OS=="ios"', {
           'configuration_policy%': 0,
           'disable_ftp_support%': 1,
           'enable_automation%': 0,
           'enable_extensions%': 0,
           'enable_printing%': 0,
+          'enable_session_service%': 0,
           'enable_themes%': 0,
           'enable_webrtc%': 0,
           'notifications%': 0,
           'remoting%': 0,
+          'safe_browsing%': 0,
         }],
 
         # Use GPU accelerated cross process image transport by default
         # on linux builds with the Aura window manager
         ['use_aura==1 and OS=="linux"', {
           'ui_compositor_image_transport%': 1,
         }, {
           'ui_compositor_image_transport%': 0,
         }],
 
@@ skipping 2787 matching lines @@
         },
         'target_conditions': [
           ['_type=="executable"', {
             'configurations': {
               'Release_Base': {
                 'xcode_settings': {
                   'DEPLOYMENT_POSTPROCESSING': 'YES',
                   'STRIP_INSTALLED_PRODUCT': 'YES',
                 },
               },
+              'Debug_Base': {
+                'xcode_settings': {
+                  # Remove dSYM to reduce build time.
+                  'DEBUG_INFORMATION_FORMAT': 'dwarf',
+                },
+              },
             },
             '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*]': '',
                 }],
@@ skipping 349 matching lines @@
       ['OS=="ios"', {
         'conditions': [
           ['ios_sdk_path==""', {
             'SDKROOT': 'iphoneos<(ios_sdk)',  # -isysroot
           }, {
             'SDKROOT': '<(ios_sdk_path)',  # -isysroot
           }],
         ],
       }],
       ['OS=="ios"', {
-        # Just build armv7 since iOS 4.3+ only supports armv7.
         'ARCHS': '$(ARCHS_UNIVERSAL_IPHONE_OS)',
+        # Just build armv7, until armv7s is correctly tested.
+        'VALID_ARCHS': 'armv7 i386',
         'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
         # Target both iPhone and iPad.
         'TARGETED_DEVICE_FAMILY': '1,2',
       }],
     ],
 
     # 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',
   },
 }