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

Unified Diff: ipc/ipc.gypi

Issue 10534115: Add an untrusted NaCl build for IPC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 | « ipc/ipc.gyp ('k') | ipc/ipc_untrusted.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
- },
- },
- },
- ],
- }],
- ],
}
« no previous file with comments | « ipc/ipc.gyp ('k') | ipc/ipc_untrusted.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698