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

Unified Diff: gyp/common_conditions.gypi

Issue 314543002: Revert of Try TSAN blacklist for SkGLContextHelper::init. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 7 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 | tools/tsan.blacklist » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_conditions.gypi
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 9529edae49fdfde00dc7d4afe469428601c1929a..cf46ed21d93f938afa275ff26b38041ca797c216 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', '-fsanitize-blacklist=>!(pwd)/../tools/tsan.blacklist' ],
+ 'cflags': [ '-fPIC' ],
'target_conditions': [
[ '_type == "executable"', {
'cflags': [ '-fPIE' ],
« no previous file with comments | « no previous file | tools/tsan.blacklist » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698