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

Side by Side Diff: ipc/ipc.gyp

Issue 1321253011: Remove dependency on //crypto in //ipc, except on windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fallback_clean
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « ipc/handle_attachment_win.cc ('k') | ipc/ipc_channel_reader_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'ipc.gypi', 10 'ipc.gypi',
11 ], 11 ],
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'ipc', 14 'target_name': 'ipc',
15 'type': '<(component)', 15 'type': '<(component)',
16 'variables': { 16 'variables': {
17 'ipc_target': 1, 17 'ipc_target': 1,
18 }, 18 },
19 'dependencies': [ 19 'dependencies': [
20 '../base/base.gyp:base', 20 '../base/base.gyp:base',
21 # TODO(viettrungluu): Needed for base/lazy_instance.h, which is suspect. 21 # TODO(viettrungluu): Needed for base/lazy_instance.h, which is suspect.
22 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 22 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
23 '../crypto/crypto.gyp:crypto',
24 ], 23 ],
25 # TODO(gregoryd): direct_dependent_settings should be shared with the 24 # TODO(gregoryd): direct_dependent_settings should be shared with the
26 # 64-bit target, but it doesn't work due to a bug in gyp 25 # 64-bit target, but it doesn't work due to a bug in gyp
27 'direct_dependent_settings': { 26 'direct_dependent_settings': {
28 'include_dirs': [ 27 'include_dirs': [
29 '..', 28 '..',
30 ], 29 ],
31 }, 30 },
31 'conditions': [
32 ['OS == "win"', {
33 'dependencies': [
34 '../crypto/crypto.gyp:crypto',
35 ],
36 }],
37 ],
32 }, 38 },
33 { 39 {
34 'target_name': 'ipc_tests', 40 'target_name': 'ipc_tests',
35 'type': '<(gtest_target_type)', 41 'type': '<(gtest_target_type)',
36 'dependencies': [ 42 'dependencies': [
37 'ipc', 43 'ipc',
38 'test_support_ipc', 44 'test_support_ipc',
39 '../base/base.gyp:base', 45 '../base/base.gyp:base',
40 '../base/base.gyp:base_i18n', 46 '../base/base.gyp:base_i18n',
41 '../base/base.gyp:test_support_base', 47 '../base/base.gyp:test_support_base',
48 '../crypto/crypto.gyp:crypto',
42 '../testing/gtest.gyp:gtest', 49 '../testing/gtest.gyp:gtest',
43 ], 50 ],
44 'include_dirs': [ 51 'include_dirs': [
45 '..' 52 '..'
46 ], 53 ],
47 'sources': [ 54 'sources': [
48 'attachment_broker_privileged_win_unittest.cc', 55 'attachment_broker_privileged_win_unittest.cc',
49 'attachment_broker_unprivileged_win_unittest.cc', 56 'attachment_broker_unprivileged_win_unittest.cc',
50 'ipc_channel_posix_unittest.cc', 57 'ipc_channel_posix_unittest.cc',
51 'ipc_channel_proxy_unittest.cc', 58 'ipc_channel_proxy_unittest.cc',
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 '../build/isolate.gypi', 222 '../build/isolate.gypi',
216 ], 223 ],
217 'sources': [ 224 'sources': [
218 'ipc_tests.isolate', 225 'ipc_tests.isolate',
219 ], 226 ],
220 }, 227 },
221 ], 228 ],
222 }], 229 }],
223 ], 230 ],
224 } 231 }
OLDNEW
« no previous file with comments | « ipc/handle_attachment_win.cc ('k') | ipc/ipc_channel_reader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698