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

Side by Side Diff: ipc/ipc.gyp

Issue 2069803003: Fold //ipc/mojo into //ipc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-ipc-deps
Patch Set: Try fix mac tests. Created 4 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 unified diff | Download patch
« no previous file with comments | « ipc/DEPS ('k') | ipc/ipc.gypi » ('j') | ipc/mojo/BUILD.gn » ('J')
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 'ipc_interfaces',
20 '../base/base.gyp:base', 21 '../base/base.gyp:base',
21 # TODO(viettrungluu): Needed for base/lazy_instance.h, which is suspect. 22 # TODO(viettrungluu): Needed for base/lazy_instance.h, which is suspect.
22 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 23 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
24 '../mojo/mojo_edk.gyp:mojo_system_impl',
25 '../mojo/mojo_public.gyp:mojo_cpp_bindings',
23 ], 26 ],
24 # TODO(gregoryd): direct_dependent_settings should be shared with the 27 # TODO(gregoryd): direct_dependent_settings should be shared with the
25 # 64-bit target, but it doesn't work due to a bug in gyp 28 # 64-bit target, but it doesn't work due to a bug in gyp
26 'direct_dependent_settings': { 29 'direct_dependent_settings': {
27 'include_dirs': [ 30 'include_dirs': [
28 '..', 31 '..',
29 ], 32 ],
30 }, 33 },
31 'conditions': [ 34 'conditions': [
32 ['OS == "win" or OS == "mac"', { 35 ['OS == "win" or OS == "mac"', {
33 'dependencies': [ 36 'dependencies': [
34 '../crypto/crypto.gyp:crypto', 37 '../crypto/crypto.gyp:crypto',
35 ], 38 ],
36 }], 39 }],
37 ], 40 ],
38 }, 41 },
39 { 42 {
43 'target_name': 'ipc_interfaces',
44 'type': 'none',
45 'variables': {
46 'mojom_files': [
47 'ipc.mojom',
48 ],
49 },
50 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
51 },
52 {
40 'target_name': 'ipc_tests', 53 'target_name': 'ipc_tests',
41 'type': '<(gtest_target_type)', 54 'type': '<(gtest_target_type)',
42 'dependencies': [ 55 'dependencies': [
43 'ipc', 56 'ipc',
44 'test_support_ipc', 57 'test_support_ipc',
45 '../base/base.gyp:base', 58 '../base/base.gyp:base',
46 '../base/base.gyp:base_i18n', 59 '../base/base.gyp:base_i18n',
47 '../base/base.gyp:test_support_base', 60 '../base/base.gyp:test_support_base',
48 '../crypto/crypto.gyp:crypto', 61 '../crypto/crypto.gyp:crypto',
62 '../mojo/mojo_edk.gyp:mojo_common_test_support',
63 '../mojo/mojo_edk.gyp:mojo_system_impl',
64 '../mojo/mojo_public.gyp:mojo_cpp_bindings',
49 '../testing/gtest.gyp:gtest', 65 '../testing/gtest.gyp:gtest',
50 ], 66 ],
51 'include_dirs': [ 67 'include_dirs': [
52 '..' 68 '..'
53 ], 69 ],
54 'sources': [ 70 'sources': [
55 'attachment_broker_mac_unittest.cc', 71 'attachment_broker_mac_unittest.cc',
56 'attachment_broker_privileged_mac_unittest.cc', 72 'attachment_broker_privileged_mac_unittest.cc',
57 'attachment_broker_privileged_win_unittest.cc', 73 'attachment_broker_privileged_win_unittest.cc',
74 'ipc_channel_mojo_unittest.cc',
58 'ipc_channel_posix_unittest.cc', 75 'ipc_channel_posix_unittest.cc',
59 'ipc_channel_proxy_unittest.cc', 76 'ipc_channel_proxy_unittest.cc',
60 'ipc_channel_reader_unittest.cc', 77 'ipc_channel_reader_unittest.cc',
61 'ipc_channel_unittest.cc', 78 'ipc_channel_unittest.cc',
62 'ipc_fuzzing_tests.cc', 79 'ipc_fuzzing_tests.cc',
63 'ipc_message_attachment_set_posix_unittest.cc', 80 'ipc_message_attachment_set_posix_unittest.cc',
64 'ipc_message_unittest.cc', 81 'ipc_message_unittest.cc',
65 'ipc_message_utils_unittest.cc', 82 'ipc_message_utils_unittest.cc',
83 'ipc_mojo_bootstrap_unittest.cc',
66 'ipc_send_fds_test.cc', 84 'ipc_send_fds_test.cc',
67 'ipc_sync_channel_unittest.cc', 85 'ipc_sync_channel_unittest.cc',
68 'ipc_sync_message_unittest.cc', 86 'ipc_sync_message_unittest.cc',
69 'ipc_sync_message_unittest.h', 87 'ipc_sync_message_unittest.h',
70 'ipc_test_messages.h', 88 'ipc_test_messages.h',
71 'ipc_test_message_generator.cc', 89 'ipc_test_message_generator.cc',
72 'ipc_test_message_generator.h', 90 'ipc_test_message_generator.h',
73 'run_all_unittests.cc', 91 'run_all_unittests.cc',
74 'sync_socket_unittest.cc', 92 'sync_socket_unittest.cc',
75 'unix_domain_socket_util_unittest.cc', 93 'unix_domain_socket_util_unittest.cc',
(...skipping 23 matching lines...) Expand all
99 { 117 {
100 'target_name': 'ipc_perftests', 118 'target_name': 'ipc_perftests',
101 'type': '<(gtest_target_type)', 119 'type': '<(gtest_target_type)',
102 # TODO(viettrungluu): Figure out which dependencies are really needed. 120 # TODO(viettrungluu): Figure out which dependencies are really needed.
103 'dependencies': [ 121 'dependencies': [
104 'ipc', 122 'ipc',
105 'test_support_ipc', 123 'test_support_ipc',
106 '../base/base.gyp:base', 124 '../base/base.gyp:base',
107 '../base/base.gyp:base_i18n', 125 '../base/base.gyp:base_i18n',
108 '../base/base.gyp:test_support_base', 126 '../base/base.gyp:test_support_base',
109 '../base/base.gyp:test_support_perf', 127 '../mojo/mojo_edk.gyp:mojo_common_test_support',
128 '../mojo/mojo_edk.gyp:mojo_system_impl',
129 '../mojo/mojo_public.gyp:mojo_cpp_bindings',
110 '../testing/gtest.gyp:gtest', 130 '../testing/gtest.gyp:gtest',
111 ], 131 ],
112 'include_dirs': [ 132 'include_dirs': [
113 '..' 133 '..'
114 ], 134 ],
115 'sources': [ 135 'sources': [
136 'ipc_mojo_perftest.cc',
116 'ipc_perftests.cc', 137 'ipc_perftests.cc',
117 'ipc_test_base.cc', 138 'ipc_test_base.cc',
118 'ipc_test_base.h', 139 'ipc_test_base.h',
140 'run_all_perftests.cc',
119 ], 141 ],
120 'conditions': [ 142 'conditions': [
121 ['OS == "android"', { 143 ['OS == "android"', {
122 'dependencies': [ 144 'dependencies': [
123 '../testing/android/native_test.gyp:native_test_native_code', 145 '../testing/android/native_test.gyp:native_test_native_code',
124 ], 146 ],
125 }], 147 }],
126 ], 148 ],
127 }, 149 },
128 { 150 {
(...skipping 25 matching lines...) Expand all
154 'conditions': [ 176 'conditions': [
155 ['OS=="win" and target_arch=="ia32"', { 177 ['OS=="win" and target_arch=="ia32"', {
156 'targets': [ 178 'targets': [
157 { 179 {
158 'target_name': 'ipc_win64', 180 'target_name': 'ipc_win64',
159 'type': '<(component)', 181 'type': '<(component)',
160 'variables': { 182 'variables': {
161 'ipc_target': 1, 183 'ipc_target': 1,
162 }, 184 },
163 'dependencies': [ 185 'dependencies': [
186 'ipc_interfaces',
164 '../base/base.gyp:base_win64', 187 '../base/base.gyp:base_win64',
165 # TODO(viettrungluu): Needed for base/lazy_instance.h, which is 188 # TODO(viettrungluu): Needed for base/lazy_instance.h, which is
166 # suspect. 189 # suspect.
167 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64', 190 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
168 '../crypto/crypto.gyp:crypto_nacl_win64', 191 '../crypto/crypto.gyp:crypto_nacl_win64',
169 ], 192 ],
170 # TODO(gregoryd): direct_dependent_settings should be shared with the 193 # TODO(gregoryd): direct_dependent_settings should be shared with the
171 # 32-bit target, but it doesn't work due to a bug in gyp 194 # 32-bit target, but it doesn't work due to a bug in gyp
172 'direct_dependent_settings': { 195 'direct_dependent_settings': {
173 'include_dirs': [ 196 'include_dirs': [
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 '../build/isolate.gypi', 262 '../build/isolate.gypi',
240 ], 263 ],
241 'sources': [ 264 'sources': [
242 'ipc_tests.isolate', 265 'ipc_tests.isolate',
243 ], 266 ],
244 }, 267 },
245 ], 268 ],
246 }], 269 }],
247 ], 270 ],
248 } 271 }
OLDNEW
« no previous file with comments | « ipc/DEPS ('k') | ipc/ipc.gypi » ('j') | ipc/mojo/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698