3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Superficial gyp changes to not immediately error out on Windows

Browse Source 
Just guarding the usage of $SDKROOT so that ninja doesn't error out
on invalid $ escape on parsing.

R=mark@chromium.org
BUG=crashpad:1

Review URL: https://codereview.chromium.org/620553004
This commit is contained in:
Scott Graham 2014-09-30 13:11:04 -07:00
parent 8decf86db8
commit 7dda7b3228
2 changed files with 128 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
tools/tools.gyp
View File

@ -13,74 +13,80 @@
# limitations under the License.
{
'targets': [
{
'target_name': 'tool_support',
'type': 'static_library',
'dependencies': [
'../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
'conditions': [
['OS=="mac"', {
'targets': [
{
'target_name': 'tool_support',
'type': 'static_library',
'dependencies': [
'../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
],
'include_dirs': [
'..',
],
'sources': [
'tool_support.cc',
'tool_support.h',
],
},
{
'target_name': 'catch_exception_tool',
'type': 'executable',
'dependencies': [
'tool_support',
'../compat/compat.gyp:compat',
'../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
'../util/util.gyp:util',
],
'include_dirs': [
'..',
],
'sources': [
'catch_exception_tool.cc',
],
},
{
'target_name': 'exception_port_tool',
'type': 'executable',
'dependencies': [
'tool_support',
'../compat/compat.gyp:compat',
'../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
'../util/util.gyp:util',
],
'include_dirs': [
'..',
],
'sources': [
'exception_port_tool.cc',
],
},
{
'target_name': 'on_demand_service_tool',
'type': 'executable',
'dependencies': [
'tool_support',
'../compat/compat.gyp:compat',
'../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
'../util/util.gyp:util',
],
'include_dirs': [
'..',
],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
],
},
'sources': [
'on_demand_service_tool.mm',
],
},
],
'include_dirs': [
'..',
],
'sources': [
'tool_support.cc',
'tool_support.h',
],
},
{
'target_name': 'catch_exception_tool',
'type': 'executable',
'dependencies': [
'tool_support',
'../compat/compat.gyp:compat',
'../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
'../util/util.gyp:util',
],
'include_dirs': [
'..',
],
'sources': [
'catch_exception_tool.cc',
],
},
{
'target_name': 'exception_port_tool',
'type': 'executable',
'dependencies': [
'tool_support',
'../compat/compat.gyp:compat',
'../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
'../util/util.gyp:util',
],
'include_dirs': [
'..',
],
'sources': [
'exception_port_tool.cc',
],
},
{
'target_name': 'on_demand_service_tool',
'type': 'executable',
'dependencies': [
'tool_support',
'../compat/compat.gyp:compat',
'../third_party/mini_chromium/mini_chromium/base/base.gyp:base',
'../util/util.gyp:util',
],
'include_dirs': [
'..',
],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
],
},
'sources': [
'on_demand_service_tool.mm',
],
},
}, {
'targets': [],
}],
],
}

100
util/util.gyp
View File

@ -25,13 +25,6 @@
'..',
'<(INTERMEDIATE_DIR)',
],
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
'$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
],
},
'sources': [
'file/fd_io.cc',
'file/fd_io.h',
@ -113,41 +106,52 @@
'synchronization/semaphore.cc',
'synchronization/semaphore.h',
],
'actions': [
{
'action_name': 'mig exc.defs',
'inputs': [
'mach/mig.py',
'$(SDKROOT)/usr/include/mach/exc.defs',
'conditions': [
['OS=="mac"', {
'actions': [
{
'action_name': 'mig exc.defs',
'inputs': [
'mach/mig.py',
'$(SDKROOT)/usr/include/mach/exc.defs',
],
'outputs': [
'<(INTERMEDIATE_DIR)/util/mach/excUser.c',
'<(INTERMEDIATE_DIR)/util/mach/excServer.c',
'<(INTERMEDIATE_DIR)/util/mach/exc.h',
'<(INTERMEDIATE_DIR)/util/mach/excServer.h',
],
'action': [
'python', '<@(_inputs)', '<@(_outputs)'
],
'process_outputs_as_sources': 1,
},
{
'action_name': 'mig mach_exc.defs',
'inputs': [
'mach/mig.py',
'$(SDKROOT)/usr/include/mach/mach_exc.defs',
],
'outputs': [
'<(INTERMEDIATE_DIR)/util/mach/mach_excUser.c',
'<(INTERMEDIATE_DIR)/util/mach/mach_excServer.c',
'<(INTERMEDIATE_DIR)/util/mach/mach_exc.h',
'<(INTERMEDIATE_DIR)/util/mach/mach_excServer.h',
],
'action': [
'python', '<@(_inputs)', '<@(_outputs)'
],
'process_outputs_as_sources': 1,
},
],
'outputs': [
'<(INTERMEDIATE_DIR)/util/mach/excUser.c',
'<(INTERMEDIATE_DIR)/util/mach/excServer.c',
'<(INTERMEDIATE_DIR)/util/mach/exc.h',
'<(INTERMEDIATE_DIR)/util/mach/excServer.h',
],
'action': [
'python', '<@(_inputs)', '<@(_outputs)'
],
'process_outputs_as_sources': 1,
},
{
'action_name': 'mig mach_exc.defs',
'inputs': [
'mach/mig.py',
'$(SDKROOT)/usr/include/mach/mach_exc.defs',
],
'outputs': [
'<(INTERMEDIATE_DIR)/util/mach/mach_excUser.c',
'<(INTERMEDIATE_DIR)/util/mach/mach_excServer.c',
'<(INTERMEDIATE_DIR)/util/mach/mach_exc.h',
'<(INTERMEDIATE_DIR)/util/mach/mach_excServer.h',
],
'action': [
'python', '<@(_inputs)', '<@(_outputs)'
],
'process_outputs_as_sources': 1,
},
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
'$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
'$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
],
},
}],
],
},
{
@ -162,11 +166,6 @@
'include_dirs': [
'..',
],
'link_settings': {
'libraries': [
'$(SDKROOT)/usr/lib/libbsm.dylib',
],
},
'sources': [
'test/errors.cc',
'test/errors.h',
@ -238,6 +237,15 @@
'test/multiprocess_exec_test.cc',
'test/multiprocess_test.cc',
],
'conditions': [
['OS=="mac"', {
'link_settings': {
'libraries': [
'$(SDKROOT)/usr/lib/libbsm.dylib',
],
},
}],
],
},
{
'target_name': 'util_test_multiprocess_exec_test_child',