summaryrefslogtreecommitdiffstats
path: root/third_party/instrumented_libraries/instrumented_libraries.gyp
diff options
context:
space:
mode:
authorearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-14 16:27:24 +0000
committerearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-14 16:27:24 +0000
commitf1b252f7ca363ef1fa56118570fb0c44efa83f6d (patch)
tree8979c4cd502cb1933ce647d0ea1f3555add13798 /third_party/instrumented_libraries/instrumented_libraries.gyp
parent71bd2a125313625cf231df6c07438fc7b8af3ab8 (diff)
downloadchromium_src-f1b252f7ca363ef1fa56118570fb0c44efa83f6d.zip
chromium_src-f1b252f7ca363ef1fa56118570fb0c44efa83f6d.tar.gz
chromium_src-f1b252f7ca363ef1fa56118570fb0c44efa83f6d.tar.bz2
Instrumented libraries: use package-specific sanitizer blacklists.
Previously we used a single blacklist file per sanitizer. The same file was used for Chromium and for every instrumented package. This change allows choosing a different blacklist file for each package, which means that package targets may now depend on the blacklist files, avoiding expensive clobbers. This CL also blacklists two known issues in instrumented libraries. BUG=313751, 367509 R=glider@chromium.org NOTRY=true TEST=MSan interactive_ui_tests, ASan compile Review URL: https://codereview.chromium.org/390093002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
-rw-r--r--third_party/instrumented_libraries/instrumented_libraries.gyp8
1 files changed, 5 insertions, 3 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 847f378..47e7874 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -48,15 +48,16 @@
],
'patch': '',
'run_before_build': '',
+ 'asan_blacklist': '',
+ 'msan_blacklist': '',
+ 'tsan_blacklist': '',
'conditions': [
['asan==1', {
- 'sanitizer_blacklist': '',
'package_cflags': ['-fsanitize=address'],
'package_ldflags': ['-fsanitize=address'],
}],
['msan==1', {
- 'sanitizer_blacklist': '<(msan_blacklist)',
'package_cflags': [
'-fsanitize=memory',
'-fsanitize-memory-track-origins=<(msan_track_origins)'
@@ -64,7 +65,6 @@
'package_ldflags': ['-fsanitize=memory'],
}],
['tsan==1', {
- 'sanitizer_blacklist': '<(tsan_blacklist)',
'package_cflags': ['-fsanitize=thread'],
'package_ldflags': ['-fsanitize=thread'],
}],
@@ -241,6 +241,7 @@
'--disable-gtk-doc-html',
'--disable-gtk-doc-pdf',
],
+ 'asan_blacklist': 'blacklists/asan/libglib2.0-0.txt',
'includes': ['standard_instrumented_package_target.gypi'],
},
{
@@ -289,6 +290,7 @@
'package_name': 'libx11-6',
'dependencies=': [],
'extra_configure_flags': ['--disable-specs'],
+ 'msan_blacklist': 'blacklists/msan/libx11-6.txt',
'includes': ['standard_instrumented_package_target.gypi'],
},
{