Instrumented libraries: use package-specific sanitizer blacklists.

third_party/instrumented_libraries/instrumented_libraries.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'verbose_libraries_build%': 0,
     'instrumented_libraries_jobs%': 1,
   },
 
@@ skipping 30 matching lines @@
     'package_ldflags': [
       '-Wl,-z,origin',
       # We set RPATH=XORIGIN when building the package and replace it with
       # $ORIGIN later. The reason is that this flag goes through configure/make
       # differently for different packages. Because of this, we can't escape the
       # $ character in a way that would work for every package.
       '-Wl,-R,XORIGIN/.'
     ],
     '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)'
         ],
         'package_ldflags': ['-fsanitize=memory'],
       }],
       ['tsan==1', {
-        'sanitizer_blacklist': '<(tsan_blacklist)',
         'package_cflags': ['-fsanitize=thread'],
         'package_ldflags': ['-fsanitize=thread'],
       }],
     ],
   },
 
   'targets': [
     {
       'target_name': 'instrumented_libraries',
       'type': 'none',
@@ skipping 156 matching lines @@
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libglib2.0-0',
       'dependencies=': [],
       'extra_configure_flags': [
         '--disable-gtk-doc',
         '--disable-gtk-doc-html',
         '--disable-gtk-doc-pdf',
       ],
+      'asan_blacklist': 'blacklists/asan/libglib2.0-0.txt',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libgpg-error0',
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libnspr4',
       'dependencies=': [],
@@ skipping 28 matching lines @@
     },
     {
       'package_name': 'libpng12-0',
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libx11-6',
       'dependencies=': [],
       'extra_configure_flags': ['--disable-specs'],
+      'msan_blacklist': 'blacklists/msan/libx11-6.txt',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libxau6',
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libxcb1',
       'dependencies=': [],
@@ skipping 292 matching lines @@
       'package_name': 'dee',
       'extra_configure_flags': [
           # See above.
           '--disable-introspection',
       ],
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
   ],
 }