diff options
| author | earthdok <earthdok@chromium.org> | 2014-10-16 13:03:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-16 20:03:48 +0000 |
| commit | 4d3d50c2048eac0cd397c7b73880466b881a2411 (patch) | |
| tree | 14849e96ff034460f0cc3a1d18f966c72ed344e4 /third_party/instrumented_libraries/instrumented_libraries.gyp | |
| parent | a10ba5389195689ad456b33eda067234ef4acacc (diff) | |
| download | chromium_src-4d3d50c2048eac0cd397c7b73880466b881a2411.zip chromium_src-4d3d50c2048eac0cd397c7b73880466b881a2411.tar.gz chromium_src-4d3d50c2048eac0cd397c7b73880466b881a2411.tar.bz2 | |
Instrumented libraries: build libpixman-1-0 with MSan, TSan.
Not sure what was broken before, but it seems to work now. I also added the
configure flags from debian/rules.
BUG=424313
TBR=glider@chromium.org
NOTRY=true
TEST=MSan
Review URL: https://codereview.chromium.org/660863005
Cr-Commit-Position: refs/heads/master@{#299963}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 9b91e64..2f10d09 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -133,13 +133,9 @@ '<(_sanitizer_type)-atk1.0', '<(_sanitizer_type)-libunity9', '<(_sanitizer_type)-dee', + '<(_sanitizer_type)-libpixman-1-0', ], 'conditions': [ - ['asan==1', { - 'dependencies': [ - '<(_sanitizer_type)-libpixman-1-0', - ], - }], ['msan==1', { 'dependencies': [ '<(_sanitizer_type)-libcups2', @@ -293,6 +289,11 @@ { 'package_name': 'libpixman-1-0', 'dependencies=': [], + 'extra_configure_flags': [ + # From debian/rules. + '--disable-gtk', + '--disable-silent-rules', + ], 'patch': 'patches/libpixman-1-0.diff', 'includes': ['standard_instrumented_package_target.gypi'], }, |