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

Unified Diff: tools/tools.gyp

Issue 620553004: Superficial gyp changes to not immediately error out on Windows (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: guard all tools in if mac Created 6 years, 3 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
« no previous file with comments | « no previous file | util/util.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/tools.gyp
diff --git a/tools/tools.gyp b/tools/tools.gyp
index 344d4034a6d7dc1ef405c32e384491d755096ba0..8b1d8cfd935d01003db271b63b613e7dc871719c 100644
--- a/tools/tools.gyp
+++ b/tools/tools.gyp
@@ -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': [],
+ }],
],
}
« no previous file with comments | « no previous file | util/util.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698