Add an instrumented library stub.

third_party/instrumented_libraries/instrumented_libraries.gyp

Index: third_party/instrumented_libraries/instrumented_libraries.gyp
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 00ad64e02cdbd056fb15d23cb887e35a4ad4dc5b..54aefa85d5851d3fe9e93611044d15370fe220dd 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',

[hans, 2016/01/27 23:44:04]

I'm not familiar with this GYP file.

It's used for building instrumented libraries, not Chromium, right?

Looks reasonable as far as I can tell, but I'm not sure I'm the right person to
review this.

+          ],
+          'action': [
+	    'touch',
+            '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/lib/libcredentialkit_pkcs11.so.0',
+            '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/<(_package_name).txt',
+          ],
+        },
+      ],
+    },
   ],
 }