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

Unified Diff: base/base.gyp

Issue 296173006: Link the contents of tools/valgrind/tsan_v2/suppressions.txt into TSan binaries. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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 | base/debug/sanitizer_options.cc » ('j') | tools/memory/suppression_string_gen.sh » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index b0d27be4ec4956a24e01f4f1b6e45c21d9e17785..aa04ea64a8c3107236bf1052fddaef252b810a79 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -5,6 +5,7 @@
{
'variables': {
'chromium_code': 1,
+ 'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/base/',
},
'includes': [
'../build/win_precompile.gypi',
@@ -999,6 +1000,14 @@
'../third_party/libc++/libc++.gyp:libcxx_proxy',
],
}],
+ ['tsan==1', {
+ 'dependencies': [
+ 'tsan_default_suppressions',
+ ],
+ 'sources': [
+ '<(shared_generated_dir)/tsan_suppressions.c',
+ ],
+ }],
],
'cflags!': [
'-fsanitize=address',
@@ -1489,5 +1498,32 @@
},
],
}],
+ ['tsan==1', {
+ 'targets': [
+ {
+ 'target_name': 'tsan_default_suppressions',
+ 'type': 'none',
+ 'actions': [
+ {
+ 'action_name': 'generate_tsan_suppressions',
+ 'variables': {
+ 'suppression_generator': '../tools/memory/suppression_string_gen.sh',
+ 'infile': '../tools/valgrind/tsan_v2/suppressions.txt',
+ 'outfile': '<(shared_generated_dir)/tsan_suppressions.c',
+ },
+ 'inputs': [ '<(infile)',
+ '<(suppression_generator)'],
+ 'outputs': [ '<(outfile)' ],
+ 'action': [
+ '<(suppression_generator)',
+ 'kTSanDefaultSuppressions', '<(infile)', '<(outfile)',
+ ],
+ 'process_outputs_as_sources': 1,
+ 'message': 'generating suppressions header from <(infile)',
Nico 2014/05/27 15:42:30 header?
Alexander Potapenko 2014/05/28 10:34:38 Used to be a header. Fixed.
+ },
+ ],
+ },
+ ],
+ }],
],
}
« no previous file with comments | « no previous file | base/debug/sanitizer_options.cc » ('j') | tools/memory/suppression_string_gen.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698