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

Side by Side Diff: ipc/ipc.gyp

Issue 11761038: Fix shutdown race in IPCSyncChannelTest and get rid of "suppressions"/annotations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: agh2 Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ipc/ipc_sync_channel_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(vtl): Needed for base/lazy_instance.h, which is suspect.
21 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 22 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
22 ], 23 ],
23 # TODO(gregoryd): direct_dependent_settings should be shared with the 24 # TODO(gregoryd): direct_dependent_settings should be shared with the
24 # 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
25 'direct_dependent_settings': { 26 'direct_dependent_settings': {
26 'include_dirs': [ 27 'include_dirs': [
27 '..', 28 '..',
28 ], 29 ],
29 }, 30 },
30 }, 31 },
31 { 32 {
32 'target_name': 'ipc_tests', 33 'target_name': 'ipc_tests',
33 'type': '<(gtest_target_type)', 34 'type': '<(gtest_target_type)',
34 'dependencies': [ 35 'dependencies': [
35 'ipc', 36 'ipc',
36 'test_support_ipc', 37 'test_support_ipc',
37 '../base/base.gyp:base', 38 '../base/base.gyp:base',
38 '../base/base.gyp:base_i18n', 39 '../base/base.gyp:base_i18n',
39 '../base/base.gyp:test_support_base', 40 '../base/base.gyp:test_support_base',
40 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
41 '../testing/gtest.gyp:gtest', 41 '../testing/gtest.gyp:gtest',
42 ], 42 ],
43 'include_dirs': [ 43 'include_dirs': [
44 '..' 44 '..'
45 ], 45 ],
46 'sources': [ 46 'sources': [
47 'file_descriptor_set_posix_unittest.cc', 47 'file_descriptor_set_posix_unittest.cc',
48 'ipc_channel_posix_unittest.cc', 48 'ipc_channel_posix_unittest.cc',
49 'ipc_fuzzing_tests.cc', 49 'ipc_fuzzing_tests.cc',
50 'ipc_message_unittest.cc', 50 'ipc_message_unittest.cc',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 ['OS=="win"', { 99 ['OS=="win"', {
100 'targets': [ 100 'targets': [
101 { 101 {
102 'target_name': 'ipc_win64', 102 'target_name': 'ipc_win64',
103 'type': '<(component)', 103 'type': '<(component)',
104 'variables': { 104 'variables': {
105 'ipc_target': 1, 105 'ipc_target': 1,
106 }, 106 },
107 'dependencies': [ 107 'dependencies': [
108 '../base/base.gyp:base_nacl_win64', 108 '../base/base.gyp:base_nacl_win64',
109 # TODO(vtl): Needed for base/lazy_instance.h, which is suspect.
109 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64', 110 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
110 ], 111 ],
111 # TODO(gregoryd): direct_dependent_settings should be shared with the 112 # TODO(gregoryd): direct_dependent_settings should be shared with the
112 # 32-bit target, but it doesn't work due to a bug in gyp 113 # 32-bit target, but it doesn't work due to a bug in gyp
113 'direct_dependent_settings': { 114 'direct_dependent_settings': {
114 'include_dirs': [ 115 'include_dirs': [
115 '..', 116 '..',
116 ], 117 ],
117 }, 118 },
118 'configurations': { 119 'configurations': {
(...skipping 17 matching lines...) Expand all
136 ], 137 ],
137 'variables': { 138 'variables': {
138 'test_suite_name': 'ipc_tests', 139 'test_suite_name': 'ipc_tests',
139 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests <(SHARED_LIB_SUFFIX)', 140 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests <(SHARED_LIB_SUFFIX)',
140 }, 141 },
141 'includes': [ '../build/apk_test.gypi' ], 142 'includes': [ '../build/apk_test.gypi' ],
142 }], 143 }],
143 }], 144 }],
144 ], 145 ],
145 } 146 }
OLDNEW
« no previous file with comments | « no previous file | ipc/ipc_sync_channel_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698