aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2014-06-02 19:11:06 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-02 19:11:06 -0700
commitab2ec19b975a898d4ee2278ddad7d4268f134478 (patch)
treee21d2dd723513211682829b296d7bd240e00385c /gyp
parentcf44feb0e192f255d598fa9a3f81b70968c98305 (diff)
Try TSAN blacklist for SkGLContextHelper::init.
Submitting to test this; this particular problem only happens on the bot. BUG=skia: R=mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/309823004
Diffstat (limited to 'gyp')
-rw-r--r--gyp/common_conditions.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index cf46ed21d9..9529edae49 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -413,7 +413,7 @@
'conditions' : [
[ 'skia_sanitizer == "thread"', {
'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ],
- 'cflags': [ '-fPIC' ],
+ 'cflags': [ '-fPIC', '-fsanitize-blacklist=>!(pwd)/../tools/tsan.blacklist' ],
'target_conditions': [
[ '_type == "executable"', {
'cflags': [ '-fPIE' ],