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

Unified 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, 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ipc/ipc_sync_channel_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc.gyp
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index 6e9bd9e4e14be5ca9b3f5cc63bdb8ca110576c34..678d166ee2bbf9497311177c3d3ade1ce4b353f3 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -18,6 +18,7 @@
},
'dependencies': [
'../base/base.gyp:base',
+ # TODO(vtl): Needed for base/lazy_instance.h, which is suspect.
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
],
# TODO(gregoryd): direct_dependent_settings should be shared with the
@@ -37,7 +38,6 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
- '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../testing/gtest.gyp:gtest',
],
'include_dirs': [
@@ -106,6 +106,7 @@
},
'dependencies': [
'../base/base.gyp:base_nacl_win64',
+ # TODO(vtl): Needed for base/lazy_instance.h, which is suspect.
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
],
# TODO(gregoryd): direct_dependent_settings should be shared with the
« 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