diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 06:09:07 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-08 06:09:07 +0000 |
| commit | bf2a909a4fc9d006c9e59e8a9e18da554847d51a (patch) | |
| tree | da24fdbc7fa5321919c309b568d2a64967478596 /ipc/ipc.gyp | |
| parent | 4c09c940f09356525ddf7641f680a84e7b1ed96a (diff) | |
| download | chromium_src-bf2a909a4fc9d006c9e59e8a9e18da554847d51a.zip chromium_src-bf2a909a4fc9d006c9e59e8a9e18da554847d51a.tar.gz chromium_src-bf2a909a4fc9d006c9e59e8a9e18da554847d51a.tar.bz2 | |
Fix shutdown race in IPCSyncChannelTest and get rid of "suppressions"/annotations.
Shut down explicitly, rather than doing it in a virtual destructor, which leads
to a vtable race.
(Possibly also related is http://crbug.com/70075, but I haven't been able to
reproduce, so I'll try to re-enable that separately.)
BUG=25841
TEST=ipc_tests + TSAN still happy
Review URL: https://chromiumcodereview.appspot.com/11761038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175487 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc.gyp')
| -rw-r--r-- | ipc/ipc.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp index 6e9bd9e..678d166 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 |