Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4124)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: breakpad/breakpad.gyp

Issue 14597007: Support target/host architecture with ninja iOS builds (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rsleevei space Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« base/base.gypi ('K') | « base/base.gypi ('k') | build/common.gypi » ('j') | build/common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: breakpad/breakpad.gyp
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index 981fc93d6a3dafd8941c617bfc4bc5cde47a642d..040be9fe2cc554e48d00c51679f5524f7830810c 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -105,7 +105,7 @@
},
],
}],
- [ 'OS=="mac"', {
+ ['OS=="mac" or (OS=="ios" and "<(GENERATOR)"=="ninja")', {
'target_defaults': {
'include_dirs': [
'src',
@@ -121,91 +121,9 @@
},
'targets': [
{
- 'target_name': 'breakpad_utilities',
- 'type': 'static_library',
- 'sources': [
- 'src/client/mac/handler/breakpad_nlist_64.cc',
- 'src/client/mac/handler/dynamic_images.cc',
- 'src/client/mac/handler/minidump_generator.cc',
- 'src/client/minidump_file_writer.cc',
- 'src/common/convert_UTF.c',
- 'src/common/mac/MachIPC.mm',
- 'src/common/mac/arch_utilities.cc',
- 'src/common/mac/bootstrap_compat.cc',
- 'src/common/mac/file_id.cc',
- 'src/common/mac/macho_id.cc',
- 'src/common/mac/macho_utilities.cc',
- 'src/common/mac/macho_walker.cc',
- 'src/common/mac/string_utilities.cc',
- 'src/common/md5.cc',
- 'src/common/simple_string_dictionary.cc',
- 'src/common/string_conversion.cc',
- ],
- },
- {
- 'target_name': 'crash_inspector',
- 'type': 'executable',
- 'variables': {
- 'mac_real_dsym': 1,
- },
- 'dependencies': [
- 'breakpad_utilities',
- ],
- 'include_dirs': [
- 'src/client/apple/Framework',
- 'src/common/mac',
- ],
- 'sources': [
- 'src/client/mac/crash_generation/ConfigFile.mm',
- 'src/client/mac/crash_generation/Inspector.mm',
- 'src/client/mac/crash_generation/InspectorMain.mm',
- ],
- 'link_settings': {
- 'libraries': [
- '$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
- '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
- ],
- }
- },
- {
- 'target_name': 'crash_report_sender',
- 'type': 'executable',
- 'mac_bundle': 1,
- 'variables': {
- 'mac_real_dsym': 1,
- },
- 'include_dirs': [
- 'src/common/mac',
- ],
- 'sources': [
- 'src/common/mac/HTTPMultipartUpload.m',
- 'src/client/mac/sender/crash_report_sender.m',
- 'src/client/mac/sender/uploader.mm',
- 'src/common/mac/GTMLogger.m',
- ],
- 'mac_bundle_resources': [
- 'src/client/mac/sender/English.lproj/Localizable.strings',
- 'src/client/mac/sender/crash_report_sender.icns',
- 'src/client/mac/sender/Breakpad.xib',
- 'src/client/mac/sender/crash_report_sender-Info.plist',
- ],
- 'mac_bundle_resources!': [
- 'src/client/mac/sender/crash_report_sender-Info.plist',
- ],
- 'xcode_settings': {
- 'INFOPLIST_FILE': 'src/client/mac/sender/crash_report_sender-Info.plist',
- },
- 'link_settings': {
- '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'],
'include_dirs++': [
# ++ ensures this comes before src brought in from target_defaults.
'pending/src',
@@ -274,6 +192,7 @@
{
'target_name': 'symupload',
'type': 'executable',
+ 'toolsets': ['host'],
'include_dirs': [
'src/common/mac',
],
@@ -287,6 +206,106 @@
],
}
},
+ ],
+ }],
+ ['OS=="mac"', {
+ 'target_defaults': {
+ 'include_dirs': [
+ 'src',
+ ],
+ 'configurations': {
+ 'Debug_Base': {
+ 'defines': [
+ # This is needed for GTMLogger to work correctly.
+ 'DEBUG',
+ ],
+ },
+ },
+ },
+ 'targets': [
+ {
+ 'target_name': 'breakpad_utilities',
+ 'type': 'static_library',
+ 'sources': [
+ 'src/client/mac/handler/breakpad_nlist_64.cc',
+ 'src/client/mac/handler/dynamic_images.cc',
+ 'src/client/mac/handler/minidump_generator.cc',
+ 'src/client/minidump_file_writer.cc',
+ 'src/common/convert_UTF.c',
+ 'src/common/mac/MachIPC.mm',
+ 'src/common/mac/arch_utilities.cc',
+ 'src/common/mac/bootstrap_compat.cc',
+ 'src/common/mac/file_id.cc',
+ 'src/common/mac/macho_id.cc',
+ 'src/common/mac/macho_utilities.cc',
+ 'src/common/mac/macho_walker.cc',
+ 'src/common/mac/string_utilities.cc',
+ 'src/common/md5.cc',
+ 'src/common/simple_string_dictionary.cc',
+ 'src/common/string_conversion.cc',
+ ],
+ },
+ {
+ 'target_name': 'crash_inspector',
+ 'type': 'executable',
+ 'variables': {
+ 'mac_real_dsym': 1,
+ },
+ 'dependencies': [
+ 'breakpad_utilities',
+ ],
+ 'include_dirs': [
+ 'src/client/apple/Framework',
+ 'src/common/mac',
+ ],
+ 'sources': [
+ 'src/client/mac/crash_generation/ConfigFile.mm',
+ 'src/client/mac/crash_generation/Inspector.mm',
+ 'src/client/mac/crash_generation/InspectorMain.mm',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
+ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+ ],
+ }
+ },
+ {
+ 'target_name': 'crash_report_sender',
+ 'type': 'executable',
+ 'mac_bundle': 1,
+ 'variables': {
+ 'mac_real_dsym': 1,
+ },
+ 'include_dirs': [
+ 'src/common/mac',
+ ],
+ 'sources': [
+ 'src/common/mac/HTTPMultipartUpload.m',
+ 'src/client/mac/sender/crash_report_sender.m',
+ 'src/client/mac/sender/uploader.mm',
+ 'src/common/mac/GTMLogger.m',
+ ],
+ 'mac_bundle_resources': [
+ 'src/client/mac/sender/English.lproj/Localizable.strings',
+ 'src/client/mac/sender/crash_report_sender.icns',
+ 'src/client/mac/sender/Breakpad.xib',
+ 'src/client/mac/sender/crash_report_sender-Info.plist',
+ ],
+ 'mac_bundle_resources!': [
+ 'src/client/mac/sender/crash_report_sender-Info.plist',
+ ],
+ 'xcode_settings': {
+ 'INFOPLIST_FILE': 'src/client/mac/sender/crash_report_sender-Info.plist',
+ },
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
+ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
+ '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
+ ],
+ }
+ },
{
'target_name': 'breakpad',
'type': 'static_library',
@@ -672,7 +691,82 @@
},
],
}],
- [ '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':
@@ -761,78 +855,7 @@
'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',
- ],
- },
- },
+ }
],
}],
],
« base/base.gypi ('K') | « base/base.gypi ('k') | build/common.gypi » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698