Add support for sub-architecture when building 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 118 matching lines @@
         'use_openssl%': '<(use_openssl)',
         'use_system_fontconfig%': '<(use_system_fontconfig)',
         'enable_viewport%': '<(enable_viewport)',
         'enable_hidpi%': '<(enable_hidpi)',
         'enable_touch_ui%': '<(enable_touch_ui)',
         'buildtype%': '<(buildtype)',
         'branding%': '<(branding)',
         'host_arch%': '<(host_arch)',
 
         # Default architecture we're building for is the architecture we're
-        # building on.
+        # building on, and possibly sub-architecture (for iOS builds).
         'target_arch%': '<(host_arch)',
+        'target_subarch%': '',
 
         # This is set when building the Android WebView inside the Android
         # build system, using the 'android' gyp backend. The WebView code is
         # still built when this is unset, but builds using the normal chromium
         # build system.
         'android_webview_build%': 0,
 
         # Set ARM architecture version.
         'arm_version%': 7,
 
@@ skipping 62 matching lines @@
           }, {
             'use_ozone_evdev%': 0,
           }],
 
           # Set default gomadir.
           ['OS=="win"', {
             'gomadir': 'c:\\goma\\goma-win',
           }, {
             'gomadir': '<!(/bin/echo -n ${HOME}/goma)',
           }],
+
+          # Set the default arch for iOS, and the sub-arch. The sub-arch can
+          # be either "arm32", "arm64" or "both" (meaning a fat binary).
+          # TODO(sdefresne): change the default from "arm32" to "both" for
+          # "target_subarch" once http://crbug.com/339477 is fixed.
+          ['OS=="ios"', {
+            'target_arch%': 'arm',
+            'target_subarch%': 'arm32',
+          }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
       'host_arch%': '<(host_arch)',
       'target_arch%': '<(target_arch)',
+      'target_subarch%': '<(target_subarch)',
       'toolkit_views%': '<(toolkit_views)',
       'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
       'desktop_linux%': '<(desktop_linux)',
       'use_aura%': '<(use_aura)',
       'use_ash%': '<(use_ash)',
       'use_cras%': '<(use_cras)',
       'use_ozone%': '<(use_ozone)',
       'use_ozone_evdev%': '<(use_ozone_evdev)',
       'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
       'embedded%': '<(embedded)',
@@ skipping 619 matching lines @@
       # keys will be used instead.
       'google_api_key%': '',
       'google_default_client_id%': '',
       'google_default_client_secret%': '',
     },
 
     # Copy conditionally-set variables out one scope.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
     'target_arch%': '<(target_arch)',
+    'target_subarch%': '<(target_subarch)',
     'host_arch%': '<(host_arch)',
     'toolkit_views%': '<(toolkit_views)',
     'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
     'use_aura%': '<(use_aura)',
     'use_ash%': '<(use_ash)',
     'use_cras%': '<(use_cras)',
     'use_openssl%': '<(use_openssl)',
     'use_nss%': '<(use_nss)',
     'use_udev%': '<(use_udev)',
     'os_bsd%': '<(os_bsd)',
@@ skipping 196 matching lines @@
     # is some third party code that takes a long time to fix/roll. So, this
     # flag allows us to have warnings as errors in general to prevent
     # regressions in most modules, while working on the bits that are
     # remaining.
     'win_third_party_warn_as_error%': 'true',
 
     # Clang stuff.
     'clang%': '<(clang)',
     'make_clang_dir%': 'third_party/llvm-build/Release+Asserts',
 
+    # Control which version of clang to use when 'clang' is set to 1 when
+    # building for iOS (Apple has not yet open-sourced support for "arm64"
+    # so when building for that 'target_arch' we have to use clang shipped
+    # with Xcode that does not supports some flags).
+    # TODO(sdefresne): remove this once http://crbug.com/341453 is fixed.
+    'clang_xcode%': 0,
+
     # These two variables can be set in GYP_DEFINES while running
     # |gclient runhooks| to let clang run a plugin in every compilation.
     # Only has an effect if 'clang=1' is in GYP_DEFINES as well.
     # Example:
     #     GYP_DEFINES='clang=1 clang_load=/abs/path/to/libPrintFunctionNames.dylib clang_add_plugin=print-fns' gclient runhooks
 
     'clang_load%': '',
     'clang_add_plugin%': '',
 
     # Tell ld64 to write map files describing binary layout. Useful
@@ skipping 624 matching lines @@
           '-t', 'ios',
           # iOS uses a whitelist to filter resources.
           '-w', '<(DEPTH)/build/ios/grit_whitelist.txt'
         ],
 
         # Enable clang and host builds when generating with ninja-ios.
         'conditions': [
           ['"<(GENERATOR)"=="ninja"', {
             'clang%': 1,
             'host_os%': "mac",
-          }]
+          }],
+          # Apple has not upstreamed the support for "arm64" yet, so when
+          # building for "arm64" or "both", we need to use the clang that
+          # is provided with Xcode.
+          ['target_subarch!="arm32"', {
+            'clang_xcode%': 1,
+          }],
         ],
       }],
       ['enable_extensions==1', {
         'grit_defines': ['-D', 'enable_extensions'],
       }],
       ['enable_plugins!=0', {
         'grit_defines': ['-D', 'enable_plugins'],
       }],
       ['enable_printing!=0', {
         'grit_defines': ['-D', 'enable_printing'],
@@ skipping 2282 matching lines @@
             # pattern.
             '-Wno-missing-field-initializers',
           ],
           'conditions': [
             ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'},
                                  {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}
             ],
             # Note that the prebuilt Clang binaries should not be used for iOS
             # development except for ASan builds.
             ['clang==1', {
-              'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
-              'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
-
               # gnu++11 instead of c++11 is needed because some code uses
               # typeof() (a GNU extension).
               # TODO(thakis): Eventually switch this to c++11 instead of
               # gnu++11 (once typeof can be removed, which is blocked on c++11
               # being available everywhere).
               'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++11',  # -std=gnu++11
               # Warn if automatic synthesis is triggered with
               # the -Wobjc-missing-property-synthesis flag.
               'CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS': 'YES',
               'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
@@ skipping 14 matching lines @@
                 # which we no longer use. Check if it makes sense to remove
                 # this as well. http://crbug.com/316352
                 '-Wno-unneeded-internal-declaration',
 
                 # Warns on switches on enums that cover all enum values but
                 # also contain a default: branch. Chrome is full of that.
                 '-Wno-covered-switch-default',
 
                 # Warns when a const char[] is converted to bool.
                 '-Wstring-conversion',
+              ],
 
-                # Clang considers the `register` keyword as deprecated, but e.g.
-                # code generated by flex (used in angle) contains that keyword.
-                # http://crbug.com/255186
-                '-Wno-deprecated-register',
+              'conditions': [
+                ['clang_xcode==0', {
+                  'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
+                  'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
+
+                  'WARNING_CFLAGS': [
+                    # Clang considers the `register` keyword as deprecated, but
+                    # e.g. code generated by flex (used in angle) contains that
+                    # keyword. http://crbug.com/255186
+                    '-Wno-deprecated-register',

[Mark Mentovai, 2014/02/10 14:50:02]

Is this in here because the clang that ships with Xcode doesn’t care about this
flag?

Does the clang that ships with Xcode complain when it sees this flag?

[sdefresne, 2014/02/10 15:04:09]

Yes, it does complain:

$ clang++ -Wno-deprecated-register empty.mm 
warning: unknown warning option '-Wno-deprecated-register'; did you mean
'-Wno-deprecated'? [-Wunknown-warning-option]

And since we configure warnings to be errors for Chromium code, this cause the
compilation to fail. But the clang in Xcode does not yet consider the register
keyword as deprecated, so the flag is not required.

[Mark Mentovai, 2014/02/10 15:05:18]

Then you should add a quick note to the comment saying why you’re disabling the
warning for trunk clang but not Xcode clang.

+                  ],
+                }],
               ],
             }],
-            ['clang==1 and clang_use_chrome_plugins==1', {
+            ['clang==1 and clang_xcode==0 and clang_use_chrome_plugins==1', {
               'OTHER_CFLAGS': [
                 '<@(clang_chrome_plugins_flags)',
               ],
             }],
-            ['clang==1 and clang_load!=""', {
+            ['clang==1 and clang_xcode==0 and clang_load!=""', {
               'OTHER_CFLAGS': [
                 '-Xclang', '-load', '-Xclang', '<(clang_load)',
               ],
             }],
-            ['clang==1 and clang_add_plugin!=""', {
+            ['clang==1 and clang_xcode==0 and clang_add_plugin!=""', {
               'OTHER_CFLAGS': [
                 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
               ],
             }],
             ['clang==1 and "<(GENERATOR)"=="ninja"', {
               'OTHER_CFLAGS': [
                 # See http://crbug.com/110262
                 '-fcolor-diagnostics',
               ],
             }],
@@ skipping 260 matching lines @@
           'WARNING_CFLAGS': [
             '-Wheader-hygiene',
             # Don't die on dtoa code that uses a char as an array index.
             # This is required solely for base/third_party/dmg_fp/dtoa.cc.
             '-Wno-char-subscripts',
             # See comment in the mac clang section above for this flag.
             '-Wno-unneeded-internal-declaration',
             # Match OS X clang C++11 warning settings.
             '-Wno-c++11-narrowing',
           ],
+
+          # Limit the valid architectures depending on "target_subarch".
+          # This need to include the "arm" architectures but also the "x86"
+          # ones (they are used when building for the simulator).
+          'conditions': [
+            ['target_subarch=="arm32"', {
+              'VALID_ARCHS': ['armv7', 'i386'],
+            }],
+            ['target_subarch=="arm64"', {
+              'VALID_ARCHS': ['arm64', 'x86_64'],
+            }],
+            ['target_subarch=="both"', {
+              'VALID_ARCHS': ['arm64', 'armv7', 'x86_64', 'i386'],
+            }],
+          ],
         },
         'target_conditions': [
           ['_toolset=="host"', {
             'xcode_settings': {
               'SDKROOT': 'macosx<(mac_sdk)',  # -isysroot
               'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
+              'VALID_ARCHS': [
+                'x86_64',
+              ],
               'ARCHS': [
-                'x86_64'
+                'x86_64',
               ],
             },
           }],
           ['_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)',
+              'ARCHS': ['$(ARCHS_STANDARD_INCLUDING_64_BIT)'],
             },
           }],
           ['_type=="executable"', {
             'configurations': {
               'Release_Base': {
                 'xcode_settings': {
                   'DEPLOYMENT_POSTPROCESSING': 'YES',
                   'STRIP_INSTALLED_PRODUCT': 'YES',
                 },
               },
@@ skipping 376 matching lines @@
     # Don't warn about the "typedef 'foo' locally defined but not used"
     # for gcc 4.8.
     # TODO: remove this flag once all builds work. See crbug.com/227506
     ['gcc_version>=48', {
       'target_defaults': {
         'cflags': [
           '-Wno-unused-local-typedefs',
         ],
       },
     }],
-    ['clang==1 and OS!="win"', {
+    ['clang==1 and clang_xcode==0 and OS!="win"', {

[Mark Mentovai, 2014/02/10 14:50:02]

Seeing clang_xcode here makes it seem like that’s relevant, but this block is
effective on any non-Windows ninja platform. Since clang_xcode is only effective
on OS=="mac" and OS=="ios", I think the condition should be revised to reflect
that:

clang==1 and ((OS!="mac" and OS!="ios") or clang_xcode==0) and OS!="win"

[sdefresne, 2014/02/10 15:04:09]

Done.

       'make_global_settings': [
         ['CC', '<(make_clang_dir)/bin/clang'],
         ['CXX', '<(make_clang_dir)/bin/clang++'],
         ['CC.host', '$(CC)'],
         ['CXX.host', '$(CXX)'],
       ],
     }],
     ['clang==1 and OS=="win"', {
       'make_global_settings': [
         # On Windows, gyp's ninja generator only looks at CC.
@@ skipping 15 matching lines @@
         ['CC', '<(sysroot)/../bin/mipsel-linux-gnu-gcc'],
         ['CXX', '<(sysroot)/../bin/mipsel-linux-gnu-g++'],
         ['CC.host', '<!(which gcc)'],
         ['CXX.host', '<!(which g++)'],
       ],
     }],
 
     # TODO(yyanagisawa): supports GENERATOR==make
     #  make generator doesn't support CC_wrapper without CC
     #  in make_global_settings yet.
-    ['use_goma==1 and ("<(GENERATOR)"=="ninja" or clang==1)', {
+    ['use_goma==1 and clang_xcode==0 and '

[Mark Mentovai, 2014/02/10 14:50:02]

Same.

[sdefresne, 2014/02/10 15:04:09]

Done.

+        '("<(GENERATOR)"=="ninja" or clang==1)', {
       'make_global_settings': [
        ['CC_wrapper', '<(gomadir)/gomacc'],
        ['CXX_wrapper', '<(gomadir)/gomacc'],
        ['CC.host_wrapper', '<(gomadir)/gomacc'],
        ['CXX.host_wrapper', '<(gomadir)/gomacc'],
       ],
     }],
   ],
   'xcode_settings': {
     # DON'T ADD ANYTHING NEW TO THIS BLOCK UNLESS YOU REALLY REALLY NEED IT!
@@ skipping 27 matching lines @@
               }],
             ],
           }, {
             'SDKROOT': '<(ios_sdk_path)',  # -isysroot
           }],
         ],
       }],
       ['OS=="ios"', {
         # Target both iPhone and iPad.
         'TARGETED_DEVICE_FAMILY': '1,2',
-        'VALID_ARCHS': 'armv7 i386',
       }, {  # OS!="ios"
         'conditions': [
           ['target_arch=="x64"', {
             'ARCHS': [
               'x86_64'
             ],
           }],
           ['target_arch=="ia32"', {
             'ARCHS': [
               'i386'
@@ skipping 10 matching lines @@
     # 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',
   },
 }