summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorgregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 21:09:39 +0000
committergregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 21:09:39 +0000
commit886a17e3ef3bce4bed8318d9734e6a7ce09feee5 (patch)
tree5461931c5f3f16421b43483c10970e9a8571d96a /ipc
parentf161af217a213baca993696b83d351471b9f4105 (diff)
downloadchromium_src-886a17e3ef3bce4bed8318d9734e6a7ce09feee5.zip
chromium_src-886a17e3ef3bce4bed8318d9734e6a7ce09feee5.tar.gz
chromium_src-886a17e3ef3bce4bed8318d9734e6a7ce09feee5.tar.bz2
Split ipc.gyp and add ipc_win64 target.
ipc and ipc_win64 targets are now defined in ipc.gypi and share most of the settings. TEST=none BUG=28176 Review URL: http://codereview.chromium.org/466028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc.gyp47
-rw-r--r--ipc/ipc.gypi99
2 files changed, 103 insertions, 43 deletions
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index 8a35b4f..0d7c5b7 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -23,49 +23,10 @@
]}],
],
},
+ 'includes': [
+ 'ipc.gypi',
+ ],
'targets': [
- {
- 'target_name': 'ipc',
- 'type': '<(library)',
- 'dependencies': [
- '../base/base.gyp:base',
- ],
- 'include_dirs': [
- '..',
- ],
- 'sources': [
- 'file_descriptor_set_posix.cc',
- 'file_descriptor_set_posix.h',
- 'ipc_channel.h',
- 'ipc_channel_handle.h',
- 'ipc_channel_posix.cc',
- 'ipc_channel_posix.h',
- 'ipc_channel_proxy.cc',
- 'ipc_channel_proxy.h',
- 'ipc_channel_win.cc',
- 'ipc_channel_win.h',
- 'ipc_descriptors.h',
- 'ipc_logging.cc',
- 'ipc_logging.h',
- 'ipc_message.cc',
- 'ipc_message.h',
- 'ipc_message_macros.h',
- 'ipc_message_utils.cc',
- 'ipc_message_utils.h',
- 'ipc_platform_file.h',
- 'ipc_switches.cc',
- 'ipc_switches.h',
- 'ipc_sync_channel.cc',
- 'ipc_sync_channel.h',
- 'ipc_sync_message.cc',
- 'ipc_sync_message.h',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- },
- },
{
'target_name': 'ipc_tests',
'type': 'executable',
@@ -104,7 +65,7 @@
}],
],
},
- ]
+ ],
}
# Local Variables:
diff --git a/ipc/ipc.gypi b/ipc/ipc.gypi
new file mode 100644
index 0000000..2623765
--- /dev/null
+++ b/ipc/ipc.gypi
@@ -0,0 +1,99 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'target_defaults': {
+ 'variables': {
+ 'ipc_target': 0,
+ },
+ 'target_conditions': [
+ # This part is shared between the targets defined below.
+ ['ipc_target==1', {
+ 'sources': [
+ 'file_descriptor_set_posix.cc',
+ 'file_descriptor_set_posix.h',
+ 'ipc_channel.h',
+ 'ipc_channel_handle.h',
+ 'ipc_channel_posix.cc',
+ 'ipc_channel_posix.h',
+ 'ipc_channel_proxy.cc',
+ 'ipc_channel_proxy.h',
+ 'ipc_channel_win.cc',
+ 'ipc_channel_win.h',
+ 'ipc_descriptors.h',
+ 'ipc_logging.cc',
+ 'ipc_logging.h',
+ 'ipc_message.cc',
+ 'ipc_message.h',
+ 'ipc_message_macros.h',
+ 'ipc_message_utils.cc',
+ 'ipc_message_utils.h',
+ 'ipc_platform_file.h',
+ 'ipc_switches.cc',
+ 'ipc_switches.h',
+ 'ipc_sync_channel.cc',
+ 'ipc_sync_channel.h',
+ 'ipc_sync_message.cc',
+ 'ipc_sync_message.h',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ }],
+ ],
+ },
+ 'targets': [
+ {
+ 'target_name': 'ipc',
+ 'type': '<(library)',
+ 'variables': {
+ 'ipc_target': 1,
+ },
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
+ # 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': '<(library)',
+ 'variables': {
+ 'ipc_target': 1,
+ },
+ 'dependencies': [
+ '../base/base.gyp:base_nacl_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': {
+ 'msvs_target_platform': 'x64',
+ },
+ },
+ },
+ ],
+ }],
+ ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2: