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

Side by Side Diff: ipc/mojo/ipc_mojo.gyp

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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/mojo/ipc_channel_mojo_unittest.cc ('k') | ipc/mojo/ipc_mojo_bootstrap.h » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 ], 10 ],
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'ipc_mojo', 13 'target_name': 'ipc_mojo',
14 'type': '<(component)', 14 'type': '<(component)',
15 'variables': { 15 'variables': {
16 }, 16 },
17 'defines': [ 17 'defines': [
18 'IPC_MOJO_IMPLEMENTATION', 18 'IPC_MOJO_IMPLEMENTATION',
19 ], 19 ],
20 'includes': [ '../../third_party/mojo/mojom_bindings_generator.gypi' ], 20 'includes': [ '../../third_party/mojo/mojom_bindings_generator.gypi' ],
21 'dependencies': [ 21 'dependencies': [
22 '../ipc.gyp:ipc', 22 '../ipc.gyp:ipc',
23 '../../base/base.gyp:base', 23 '../../base/base.gyp:base',
24 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 24 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
25 '../../mojo/mojo_base.gyp:mojo_environment_chromium', 25 '../../mojo/mojo_base.gyp:mojo_environment_chromium',
26 '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 26 '../../mojo/mojo_edk.gyp:mojo_system_impl',
27 '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 27 '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
28 ], 28 ],
29 'sources': [ 29 'sources': [
30 'client_channel.mojom',
31 'async_handle_waiter.cc', 30 'async_handle_waiter.cc',
32 'async_handle_waiter.h', 31 'async_handle_waiter.h',
33 'ipc_channel_mojo.cc', 32 'ipc_channel_mojo.cc',
34 'ipc_channel_mojo.h', 33 'ipc_channel_mojo.h',
35 'ipc_mojo_bootstrap.cc', 34 'ipc_mojo_bootstrap.cc',
36 'ipc_mojo_bootstrap.h', 35 'ipc_mojo_bootstrap.h',
37 'ipc_mojo_handle_attachment.cc', 36 'ipc_mojo_handle_attachment.cc',
38 'ipc_mojo_handle_attachment.h', 37 'ipc_mojo_handle_attachment.h',
39 'ipc_mojo_message_helper.cc', 38 'ipc_mojo_message_helper.cc',
40 'ipc_mojo_message_helper.h', 39 'ipc_mojo_message_helper.h',
(...skipping 15 matching lines...) Expand all
56 { 55 {
57 'target_name': 'ipc_mojo_unittests', 56 'target_name': 'ipc_mojo_unittests',
58 'type': '<(gtest_target_type)', 57 'type': '<(gtest_target_type)',
59 'dependencies': [ 58 'dependencies': [
60 '../ipc.gyp:ipc', 59 '../ipc.gyp:ipc',
61 '../ipc.gyp:test_support_ipc', 60 '../ipc.gyp:test_support_ipc',
62 '../../base/base.gyp:base', 61 '../../base/base.gyp:base',
63 '../../base/base.gyp:base_i18n', 62 '../../base/base.gyp:base_i18n',
64 '../../base/base.gyp:test_support_base', 63 '../../base/base.gyp:test_support_base',
65 '../../mojo/mojo_base.gyp:mojo_environment_chromium', 64 '../../mojo/mojo_base.gyp:mojo_environment_chromium',
65 '../../mojo/mojo_edk.gyp:mojo_system_impl',
66 '../../testing/gtest.gyp:gtest', 66 '../../testing/gtest.gyp:gtest',
67 '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
68 '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 67 '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
69 'ipc_mojo', 68 'ipc_mojo',
70 ], 69 ],
71 'include_dirs': [ 70 'include_dirs': [
72 '..' 71 '..'
73 ], 72 ],
74 'sources': [ 73 'sources': [
75 'async_handle_waiter_unittest.cc', 74 'async_handle_waiter_unittest.cc',
76 'run_all_unittests.cc', 75 'run_all_unittests.cc',
77 'ipc_channel_mojo_unittest.cc', 76 'ipc_channel_mojo_unittest.cc',
78 'ipc_mojo_bootstrap_unittest.cc', 77 'ipc_mojo_bootstrap_unittest.cc',
79 ], 78 ],
80 'conditions': [ 79 'conditions': [
81 ], 80 ],
82 }, 81 },
83 { 82 {
84 'target_name': 'ipc_mojo_perftests', 83 'target_name': 'ipc_mojo_perftests',
85 'type': '<(gtest_target_type)', 84 'type': '<(gtest_target_type)',
86 'dependencies': [ 85 'dependencies': [
87 '../ipc.gyp:ipc', 86 '../ipc.gyp:ipc',
88 '../ipc.gyp:test_support_ipc', 87 '../ipc.gyp:test_support_ipc',
89 '../../base/base.gyp:base', 88 '../../base/base.gyp:base',
90 '../../base/base.gyp:base_i18n', 89 '../../base/base.gyp:base_i18n',
91 '../../base/base.gyp:test_support_base', 90 '../../base/base.gyp:test_support_base',
92 '../../base/base.gyp:test_support_perf', 91 '../../base/base.gyp:test_support_perf',
93 '../../mojo/mojo_base.gyp:mojo_environment_chromium', 92 '../../mojo/mojo_base.gyp:mojo_environment_chromium',
93 '../../mojo/mojo_edk.gyp:mojo_system_impl',
94 '../../testing/gtest.gyp:gtest', 94 '../../testing/gtest.gyp:gtest',
95 '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
96 '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 95 '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
97 'ipc_mojo', 96 'ipc_mojo',
98 ], 97 ],
99 'include_dirs': [ 98 'include_dirs': [
100 '..' 99 '..'
101 ], 100 ],
102 'sources': [ 101 'sources': [
103 'ipc_mojo_perftest.cc', 102 'ipc_mojo_perftest.cc',
104 ], 103 ],
105 'conditions': [ 104 'conditions': [
106 ], 105 ],
107 }, 106 },
108 ], 107 ],
109 } 108 }
OLDNEW
« no previous file with comments | « ipc/mojo/ipc_channel_mojo_unittest.cc ('k') | ipc/mojo/ipc_mojo_bootstrap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698