Support target/host architecture with ninja iOS builds

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 0ebc85bbbaa84d75efd32bea1e45abd926632799..c4bbc2f62802d4934a4295b510b319ceb9b37d5f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1300,7 +1300,7 @@
         # Copy it out one scope.
         'android_webview_build%': '<(android_webview_build)',
       }],  # OS=="android"
-      ['OS=="mac"', {
+      ['OS=="mac" or OS=="ios"', {
         'variables': {
           # Mac OS X SDK and deployment target support.  The SDK identifies
           # the version of the system headers that will be used, and
@@ -1333,37 +1333,41 @@
         'mac_sdk_path': '<(mac_sdk_path)',
         'mac_deployment_target': '<(mac_deployment_target)',
 
-        # Enable clang on mac by default!
-        'clang%': 1,
-
-        # Compile in Breakpad support by default so that it can be
-        # tested, even if it is not enabled by default at runtime.
-        'mac_breakpad_compiled_in%': 1,
         'conditions': [

[stuartmorgan, 2013/05/07 13:14:46]

Probably clearer if you just make the mac section a sibling of the mac || ios
section instead of nesting it like this. Or are there variable scoping issues
with that?

[justincohen, 2013/05/07 14:50:57]

Yeah, it ended up looking like this because of var scoping.

On 2013/05/07 13:14:46, stuartmorgan wrote:

-          # mac_product_name is set to the name of the .app bundle as it should
-          # appear on disk.  This duplicates data from
-          # chrome/app/theme/chromium/BRANDING and
-          # chrome/app/theme/google_chrome/BRANDING, but is necessary to get
-          # these names into the build system.
-          ['branding=="Chrome"', {
-            'mac_product_name%': 'Google Chrome',
-          }, { # else: branding!="Chrome"
-            'mac_product_name%': 'Chromium',
-          }],
+          ['OS=="mac"', {
+            # Enable clang on mac by default!
+            'clang%': 1,
 
-          ['branding=="Chrome" and buildtype=="Official"', {
-            'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py --verify <(mac_sdk_min) --sdk_path=<(mac_sdk_path))',
-            # Enable uploading crash dumps.
-            'mac_breakpad_uploads%': 1,
-            # Enable dumping symbols at build time for use by Mac Breakpad.
-            'mac_breakpad%': 1,
-            # Enable Keystone auto-update support.
-            'mac_keystone%': 1,
-          }, { # else: branding!="Chrome" or buildtype!="Official"
-            'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py <(mac_sdk_min))',
-            'mac_breakpad_uploads%': 0,
-            'mac_breakpad%': 0,
-            'mac_keystone%': 0,
+            # Compile in Breakpad support by default so that it can be
+            # tested, even if it is not enabled by default at runtime.
+            'mac_breakpad_compiled_in%': 1,
+            'conditions': [
+              # mac_product_name is set to the name of the .app bundle as it should
+              # appear on disk.  This duplicates data from
+              # chrome/app/theme/chromium/BRANDING and
+              # chrome/app/theme/google_chrome/BRANDING, but is necessary to get
+              # these names into the build system.
+              ['branding=="Chrome"', {
+                'mac_product_name%': 'Google Chrome',
+              }, { # else: branding!="Chrome"
+                'mac_product_name%': 'Chromium',
+              }],
+
+              ['branding=="Chrome" and buildtype=="Official"', {
+                'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py --verify <(mac_sdk_min) --sdk_path=<(mac_sdk_path))',
+                # Enable uploading crash dumps.
+                'mac_breakpad_uploads%': 1,
+                # Enable dumping symbols at build time for use by Mac Breakpad.
+                'mac_breakpad%': 1,
+                # Enable Keystone auto-update support.
+                'mac_keystone%': 1,
+              }, { # else: branding!="Chrome" or buildtype!="Official"
+                'mac_sdk%': '<!(python <(DEPTH)/build/mac/find_sdk.py <(mac_sdk_min))',
+                'mac_breakpad_uploads%': 0,
+                'mac_breakpad%': 0,
+                'mac_keystone%': 0,
+              }],
+            ],
           }],
         ],
       }],  # OS=="mac"

[stuartmorgan, 2013/05/07 13:14:46]

If you do have to keep the nested structure for variables, fix this comment, and
add a closing comment to the new Mac block.

[justincohen, 2013/05/07 14:50:57]

Done.

@@ -3068,14 +3072,14 @@
             # libstdc++ in C++11 mode. So no C++11 mode for Android yet.
             # Doesn't work with asan for some reason either: crbug.com/233464
             'cflags': [
-              # Especially needed for gtest macros using enum values from Mac	
-              # system headers.	
-              # TODO(pkasting): In C++11 this is legal, so this should be	
-              # removed when we change to that.  (This is also why we don't	
-              # bother fixing all these cases today.)	
-              '-Wno-unnamed-type-template-args',	
-              # This (rightfully) complains about 'override', which we use	
-              # heavily.	
+              # Especially needed for gtest macros using enum values from Mac
+              # system headers.
+              # TODO(pkasting): In C++11 this is legal, so this should be
+              # removed when we change to that.  (This is also why we don't
+              # bother fixing all these cases today.)
+              '-Wno-unnamed-type-template-args',
+              # This (rightfully) complains about 'override', which we use
+              # heavily.
               '-Wno-c++11-extensions',
             ],
           }],
@@ -4018,6 +4022,17 @@
           ],
         },
         'target_conditions': [
+          ['_toolset=="host"', {
+            'xcode_settings': {
+              'SDKROOT': 'macosx<(mac_sdk)',  # -isysroot
+              'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
+            },
+          }],
+          ['_toolset=="target"', {
+            'xcode_settings': {
+              'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_deployment_target)',
+            },
+          }],
           ['_type=="executable"', {
             'configurations': {
               'Release_Base': {
@@ -4421,7 +4436,6 @@
         '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',
       }],