Index: ipc/ipc.gypi |
=================================================================== |
--- ipc/ipc.gypi (revision 141739) |
+++ ipc/ipc.gypi (working copy) |
@@ -16,6 +16,8 @@ |
'ipc_channel.h', |
'ipc_channel.cc', |
'ipc_channel_handle.h', |
+ 'ipc_channel_nacl.cc', |
+ 'ipc_channel_nacl.h', |
'ipc_channel_posix.cc', |
'ipc_channel_posix.h', |
'ipc_channel_proxy.cc', |
@@ -59,56 +61,14 @@ |
'include_dirs': [ |
'..', |
], |
+ 'target_conditions': [ |
+ ['>(nacl_untrusted_build)==1', { |
+ 'sources!': [ |
+ 'ipc_channel_posix.cc', |
+ ], |
+ }], |
+ ], |
}], |
], |
}, |
- 'targets': [ |
- { |
- 'target_name': 'ipc', |
- 'type': '<(component)', |
- 'variables': { |
- 'ipc_target': 1, |
- }, |
- 'dependencies': [ |
- '../base/base.gyp:base', |
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
- ], |
- # TODO(gregoryd): direct_dependent_settings should be shared with the |
- # 64-bit target, but it doesn't work due to a bug in gyp |
- 'direct_dependent_settings': { |
- 'include_dirs': [ |
- '..', |
- ], |
- }, |
- }, |
- ], |
- 'conditions': [ |
- ['OS=="win"', { |
- 'targets': [ |
- { |
- 'target_name': 'ipc_win64', |
- 'type': '<(component)', |
- 'variables': { |
- 'ipc_target': 1, |
- }, |
- 'dependencies': [ |
- '../base/base.gyp:base_nacl_win64', |
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64', |
- ], |
- # TODO(gregoryd): direct_dependent_settings should be shared with the |
- # 32-bit target, but it doesn't work due to a bug in gyp |
- 'direct_dependent_settings': { |
- 'include_dirs': [ |
- '..', |
- ], |
- }, |
- 'configurations': { |
- 'Common_Base': { |
- 'msvs_target_platform': 'x64', |
- }, |
- }, |
- }, |
- ], |
- }], |
- ], |
} |