diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-11 08:24:41 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-11 08:24:41 +0000 |
| commit | f4dea3e482c013142b1fe9dd5801b1fb4a3afa4d (patch) | |
| tree | f1993dd7f1291de5874aaf1ec3a932a61171a1db /remoting | |
| parent | c54d911db046bb7fdcf7925181c47a048823328b (diff) | |
| download | chromium_src-f4dea3e482c013142b1fe9dd5801b1fb4a3afa4d.zip chromium_src-f4dea3e482c013142b1fe9dd5801b1fb4a3afa4d.tar.gz chromium_src-f4dea3e482c013142b1fe9dd5801b1fb4a3afa4d.tar.bz2 | |
Fix Windows debug trybots / shared builds when building remoting_service.
http://crrev.com/121537 added a Singleton from base/memory/singleton.h . The inlined code of singleton.h includes dynamic memory annotations from base/third_party/dynamic_annotations/dynamic_annotations.gyp, which means every target that includes a Singleton should be marked as a dependent on base/third_party/dynamic_annotations/dynamic_annotations.gyp.
Since a target cannot re-export a dependency (only its settings, via direct_dependent_settings/export_dependent_settings), add an explicit dependency on dynamic_annotations.gyp to the remoting_service target.
TBR=sergeyu
Review URL: http://codereview.chromium.org/9378034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 8e65062..691cb72 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -236,6 +236,7 @@ 'variables': { 'enable_wexit_time_destructors': 1, }, 'dependencies': [ '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', ], 'sources': [ 'base/scoped_sc_handle_win.cc', |