diff options
| author | eugenis <eugenis@chromium.org> | 2016-01-27 16:25:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 00:26:15 +0000 |
| commit | 8067d7167b2314851e5218b72f19b99e79b93fa9 (patch) | |
| tree | 00be8e68d02f5aa96b8ad311401a69b915e65b2a | |
| parent | fbfb39d126f7a6e24f369c950954298949d718a3 (diff) | |
| download | chromium_src-8067d7167b2314851e5218b72f19b99e79b93fa9.zip chromium_src-8067d7167b2314851e5218b72f19b99e79b93fa9.tar.gz chromium_src-8067d7167b2314851e5218b72f19b99e79b93fa9.tar.bz2 | |
Add an instrumented library stub.
Add an empty file with the right name under instrumented_libraries to
convince NSS not to load the system-wide uninstrumented library with
the same name. We can not build this library from source.
BUG=520257
TBR=glider@chromium.org
Review URL: https://codereview.chromium.org/1640873003
Cr-Commit-Position: refs/heads/master@{#371931}
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index 00ad64e..54aefa8 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -199,6 +199,7 @@ '<(_sanitizer_type)-libpixman-1-0', '<(_sanitizer_type)-brltty', '<(_sanitizer_type)-libva1', + '<(_sanitizer_type)-libcredentialkit_pkcs11-stub', ], 'conditions': [ ['"<(_ubuntu_release)"=="precise"', { @@ -857,5 +858,26 @@ 'pre_build': 'scripts/pre-build/autoreconf.sh', 'includes': ['standard_instrumented_package_target.gypi'], }, + { + # Creates a stub to convince NSS to not load the system-wide uninstrumented library. + # It appears that just an empty file is enough. + 'package_name': 'libcredentialkit_pkcs11-stub', + 'target_name': '<(_sanitizer_type)-<(_package_name)', + 'type': 'none', + 'actions': [ + { + 'action_name': '<(_package_name)', + 'inputs': [], + 'outputs': [ + '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/<(_package_name).txt', + ], + 'action': [ + 'touch', + '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/lib/libcredentialkit_pkcs11.so.0', + '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/<(_package_name).txt', + ], + }, + ], + }, ], } |