Support target/host architecture with ninja iOS builds

breakpad/breakpad.gyp

 # 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.
 
 {
   'includes': [
     'breakpad_sender.gypi',
     'breakpad_handler.gypi',
   ],
   'conditions': [
@@ skipping 87 matching lines @@
             'src/processor/logging.cc',
             'src/processor/logging.h',
             'src/processor/minidump.cc',
             'src/processor/minidump_dump.cc',
             'src/processor/pathname_stripper.cc',
             'src/processor/pathname_stripper.h',
           ],
         },
       ],
     }],
-    [ 'OS=="mac"', {
+    [ 'OS=="mac" or (OS=="ios" and "<(GENERATOR)"=="ninja")', {
       'target_defaults': {
         'include_dirs': [
           'src',
         ],
         'configurations': {
           'Debug_Base': {
             'defines': [
               # This is needed for GTMLogger to work correctly.
               'DEBUG',
             ],
@@ skipping 80 matching lines @@
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
               '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
             ],
           }
         },
         {
           'target_name': 'dump_syms',
           'type': 'executable',
+          'toolsets': ['host','target'],

[stuartmorgan, 2013/05/06 11:56:35]

spaces after ,

[justincohen, 2013/05/06 14:17:36]

Done.

           'include_dirs++': [
             # ++ ensures this comes before src brought in from target_defaults.
             'pending/src',
           ],
           'include_dirs': [
             'src/common/mac',
           ],
           'sources': [
             'pending/src/common/dwarf_cu_to_module.cc',
             'pending/src/common/module.cc',
@@ skipping 48 matching lines @@
                 # at -O0 until this can be sorted out.
                 # http://code.google.com/p/google-breakpad/issues/detail?id=329
                 'GCC_OPTIMIZATION_LEVEL': '0',  # -O0
                },
              },
           },
         },
         {
           'target_name': 'symupload',
           'type': 'executable',
+          'toolsets': ['host','target'],
           'include_dirs': [
             'src/common/mac',
           ],
           'sources': [
             'src/common/mac/HTTPMultipartUpload.m',
             'src/tools/mac/symupload/symupload.m',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
@@ skipping 373 matching lines @@
             'breakpad_client',
           ],
 
           'include_dirs': [
             '..',
             'src',
           ],
         },
       ],
     }],
-    [ 'OS=="ios"', {
+    ['OS=="ios"', {
+      'targets': [
+        {
+          'target_name': 'breakpad_client',
+          'type': 'static_library',
+          'sources': [
+            'src/client/ios/Breakpad.h',
+            'src/client/ios/Breakpad.mm',
+            'src/client/ios/BreakpadController.h',
+            'src/client/ios/BreakpadController.mm',
+            'src/client/ios/handler/ios_exception_minidump_generator.mm',
+            'src/client/ios/handler/ios_exception_minidump_generator.h',
+            'src/client/mac/crash_generation/ConfigFile.h',
+            'src/client/mac/crash_generation/ConfigFile.mm',
+            'src/client/mac/handler/breakpad_nlist_64.cc',
+            'src/client/mac/handler/breakpad_nlist_64.h',
+            'src/client/mac/handler/dynamic_images.cc',
+            'src/client/mac/handler/dynamic_images.h',
+            'src/client/mac/handler/protected_memory_allocator.cc',
+            'src/client/mac/handler/protected_memory_allocator.h',
+            'src/client/mac/handler/exception_handler.cc',
+            'src/client/mac/handler/exception_handler.h',
+            'src/client/mac/handler/minidump_generator.cc',
+            'src/client/mac/handler/minidump_generator.h',
+            'src/client/mac/sender/uploader.h',
+            'src/client/mac/sender/uploader.mm',
+            'src/client/minidump_file_writer.cc',
+            'src/client/minidump_file_writer.h',
+            'src/client/minidump_file_writer-inl.h',
+            'src/common/convert_UTF.c',
+            'src/common/convert_UTF.h',
+            'src/common/mac/file_id.cc',
+            'src/common/mac/file_id.h',
+            'src/common/mac/HTTPMultipartUpload.m',
+            'src/common/mac/macho_id.cc',
+            'src/common/mac/macho_id.h',
+            'src/common/mac/macho_utilities.cc',
+            'src/common/mac/macho_utilities.h',
+            'src/common/mac/macho_walker.cc',
+            'src/common/mac/macho_walker.h',
+            'src/common/mac/string_utilities.cc',
+            'src/common/mac/string_utilities.h',
+            'src/common/md5.cc',
+            'src/common/md5.h',
+            'src/common/simple_string_dictionary.cc',
+            'src/common/simple_string_dictionary.h',
+            'src/common/string_conversion.cc',
+            'src/common/string_conversion.h',
+            'src/google_breakpad/common/minidump_format.h',
+          ],
+          'include_dirs': [
+            'src',
+            'src/client/mac/Framework',
+            'src/common/mac',
+            # For GTMLogger.
+            '<(DEPTH)/third_party/GTM',
+            '<(DEPTH)/third_party/GTM/Foundation',
+          ],
+          'link_settings': {
+            # Build the version of GTMLogger.m in third_party rather than the
+            # one in src/common/mac because the former catches all exceptions
+            # whereas the latter lets them propagate, which can cause odd
+            # crashes.
+            'sources': [
+              '<(DEPTH)/third_party/GTM/Foundation/GTMLogger.h',
+              '<(DEPTH)/third_party/GTM/Foundation/GTMLogger.m',
+            ],
+            'include_dirs': [
+              '<(DEPTH)/third_party/GTM',
+              '<(DEPTH)/third_party/GTM/Foundation',
+            ],
+          },
+        }
+      ]
+    }],
+    ['OS=="ios" and "<(GENERATOR)"!="ninja"', {
       'variables': {
         'ninja_output_dir': 'ninja-breakpad',
         'ninja_product_dir':
           '<(DEPTH)/xcodebuild/<(ninja_output_dir)/<(CONFIGURATION_NAME)',
       },
       # Generation is done via two actions: (1) compiling the executable with
       # ninja, and (2) copying the executable into a location that is shared
       # with other projects. These actions are separated into two targets in
       # order to be able to specify that the second action should not run until
       # the first action finishes (since the ordering of multiple actions in
@@ skipping 68 matching lines @@
           'dependencies': [
             'breakpad_utilities',
           ],
         },
         {
           'target_name': 'symupload',
           'type': 'none',
           'dependencies': [
             'breakpad_utilities',
           ],
-        },
-        {
-          'target_name': 'breakpad_client',
-          'type': 'static_library',
-          'sources': [
-            'src/client/ios/Breakpad.h',
-            'src/client/ios/Breakpad.mm',
-            'src/client/ios/BreakpadController.h',
-            'src/client/ios/BreakpadController.mm',
-            'src/client/ios/handler/ios_exception_minidump_generator.mm',
-            'src/client/ios/handler/ios_exception_minidump_generator.h',
-            'src/client/mac/crash_generation/ConfigFile.h',
-            'src/client/mac/crash_generation/ConfigFile.mm',
-            'src/client/mac/handler/breakpad_nlist_64.cc',
-            'src/client/mac/handler/breakpad_nlist_64.h',
-            'src/client/mac/handler/dynamic_images.cc',
-            'src/client/mac/handler/dynamic_images.h',
-            'src/client/mac/handler/protected_memory_allocator.cc',
-            'src/client/mac/handler/protected_memory_allocator.h',
-            'src/client/mac/handler/exception_handler.cc',
-            'src/client/mac/handler/exception_handler.h',
-            'src/client/mac/handler/minidump_generator.cc',
-            'src/client/mac/handler/minidump_generator.h',
-            'src/client/mac/sender/uploader.h',
-            'src/client/mac/sender/uploader.mm',
-            'src/client/minidump_file_writer.cc',
-            'src/client/minidump_file_writer.h',
-            'src/client/minidump_file_writer-inl.h',
-            'src/common/convert_UTF.c',
-            'src/common/convert_UTF.h',
-            'src/common/mac/file_id.cc',
-            'src/common/mac/file_id.h',
-            'src/common/mac/HTTPMultipartUpload.m',
-            'src/common/mac/macho_id.cc',
-            'src/common/mac/macho_id.h',
-            'src/common/mac/macho_utilities.cc',
-            'src/common/mac/macho_utilities.h',
-            'src/common/mac/macho_walker.cc',
-            'src/common/mac/macho_walker.h',
-            'src/common/mac/string_utilities.cc',
-            'src/common/mac/string_utilities.h',
-            'src/common/md5.cc',
-            'src/common/md5.h',
-            'src/common/simple_string_dictionary.cc',
-            'src/common/simple_string_dictionary.h',
-            'src/common/string_conversion.cc',
-            'src/common/string_conversion.h',
-            'src/google_breakpad/common/minidump_format.h',
-          ],
-          'include_dirs': [
-            'src',
-            'src/client/mac/Framework',
-            'src/common/mac',
-            # For GTMLogger.
-            '<(DEPTH)/third_party/GTM',
-            '<(DEPTH)/third_party/GTM/Foundation',
-          ],
-          'link_settings': {
-            # Build the version of GTMLogger.m in third_party rather than the
-            # one in src/common/mac because the former catches all exceptions
-            # whereas the latter lets them propagate, which can cause odd
-            # crashes.
-            'sources': [
-              '<(DEPTH)/third_party/GTM/Foundation/GTMLogger.h',
-              '<(DEPTH)/third_party/GTM/Foundation/GTMLogger.m',
-            ],
-            'include_dirs': [
-              '<(DEPTH)/third_party/GTM',
-              '<(DEPTH)/third_party/GTM/Foundation',
-            ],
-          },
-        },
+        }
       ],
     }],
   ],
 }