diff options
| author | earthdok <earthdok@chromium.org> | 2014-10-30 11:07:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-30 18:08:22 +0000 |
| commit | 393e13d9565ad8bf48c18df396a083c140df72b8 (patch) | |
| tree | 1c6d7360a5cbd4df675de209d9beed6823e55143 /third_party/instrumented_libraries | |
| parent | e52346f194e9f2d097b4f6d3fbfa359eca7c92df (diff) | |
| download | chromium_src-393e13d9565ad8bf48c18df396a083c140df72b8.zip chromium_src-393e13d9565ad8bf48c18df396a083c140df72b8.tar.gz chromium_src-393e13d9565ad8bf48c18df396a083c140df72b8.tar.bz2 | |
Instrumented libraries: add libtasn1-6.
BUG=414189
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/694583002
Cr-Commit-Position: refs/heads/master@{#302108}
Diffstat (limited to 'third_party/instrumented_libraries')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 2f10d09..f2e87b5 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -120,7 +120,6 @@ '<(_sanitizer_type)-pango1.0', '<(_sanitizer_type)-libcap2', '<(_sanitizer_type)-udev', - '<(_sanitizer_type)-libtasn1-3', '<(_sanitizer_type)-libgnome-keyring0', '<(_sanitizer_type)-libgtk2.0-0', '<(_sanitizer_type)-libgdk-pixbuf2.0-0', @@ -136,6 +135,15 @@ '<(_sanitizer_type)-libpixman-1-0', ], 'conditions': [ + ['"<(_ubuntu_release)"=="precise"', { + 'dependencies': [ + '<(_sanitizer_type)-libtasn1-3', + ], + }, { + 'dependencies': [ + '<(_sanitizer_type)-libtasn1-6', + ], + }], ['msan==1', { 'dependencies': [ '<(_sanitizer_type)-libcups2', @@ -489,6 +497,19 @@ { 'package_name': 'libtasn1-3', 'dependencies=': [], + 'extra_configure_flags': [ + # From debian/rules. + '--enable-ld-version-script', + ], + 'includes': ['standard_instrumented_package_target.gypi'], + }, + { + 'package_name': 'libtasn1-6', + 'dependencies=': [], + 'extra_configure_flags': [ + # From debian/rules. + '--enable-ld-version-script', + ], 'includes': ['standard_instrumented_package_target.gypi'], }, { |