Fix iOS device builds broken by commit d645540

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 4641 matching lines @@
           }, {
             'SDKROOT': '<(ios_sdk_path)',  # -isysroot
           }],
         ],
       }],
       ['OS=="ios"', {
         # Target both iPhone and iPad.
         'TARGETED_DEVICE_FAMILY': '1,2',
         'VALID_ARCHS': 'armv7 i386',
       }],
       ['target_arch=="x64"', {

[Mark Mentovai, 2013/11/04 20:28:42]

How about instead, move this whole block from 4662 through 4674 into the “else”
clause for OS=="ios", which you can introduce on line 4661? Then it’s
self-documenting and I don’t think the comment is even necessary.

[kiyun, 2013/11/04 20:48:50]

Done.

         'ARCHS': [
           'x86_64'
          ],
       }],
-      ['target_arch=="ia32"', {
+      # Mac builds set ARCHS explicitly to i386. Leave ARCHS unspecified for
+      # iOS builds, so that Xcode will use the appropriate defaults for
+      # simulator and device builds, which are different architectures.
+      ['target_arch=="ia32" and OS!="ios"', {
         'ARCHS': [
           'i386'
          ],
       }],
     ],
 
     # 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',
   },
 }