| commit | 91506eb0b9461a19c6fc7dc0b15edbdbd1ed094d | [log] [tgz] |
|---|---|---|
| author | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jan 21 15:11:02 2014 +0000 |
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Tue Jan 21 15:11:02 2014 +0000 |
| tree | bbe2e7ed2c61438c34500a77a7ad4838c75736bb | |
| parent | 5e93b858844328f8118591507a16f8686624b70e [diff] |
Scope our ANNOTATE_BENIGN_RACE. This should unstick the DEPS roll. When building with TSAN, Chromium's pulling in the canonical one from dynamic_annotations.h, and we're trying to redefine it. R=robertphillips@google.com, reed@google.com, bsalomon@google.com TBR=reed@google.com BUG= Author: mtklein@google.com Review URL: https://codereview.chromium.org/144063002 git-svn-id: http://skia.googlecode.com/svn/trunk@13129 2bbb7eff-a529-9590-31e7-b0007b416f81