Re-land: Instrumented libraries: add a target for pre-built libraries.

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 64 matching lines @@
       }],
       ['tsan==1', {
         'package_cflags': ['-fsanitize=thread'],
         'package_ldflags': ['-fsanitize=thread'],
       }],
     ],
   },
 
   'targets': [
     {
+      'target_name': 'prebuilt_instrumented_libraries',
+      'type': 'none',
+      'variables': {
+        'prune_self_dependency': 1,
+        # Don't add this target to the dependencies of targets with type=none.
+        'link_dependency': 1,
+        'conditions': [
+          ['msan==1', {
+            'conditions': [
+              ['msan_track_origins==2', {
+                'archive_name': 'msan-chained-origins-<(_ubuntu_release)',
+              }, {
+                'archive_name': 'UNSUPPORTED_CONFIGURATION'
+              }],
+          ]}, {
+              'archive_name': 'UNSUPPORTED_CONFIGURATION'
+          }],
+        ],
+      },
+      'actions': [
+        {
+          'action_name': 'unpack_<(archive_name).tgz',
+          'inputs': [
+            'binaries/<(archive_name).tgz',
+          ],
+          'outputs': [
+            '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/<(archive_name).txt',
+          ],
+          'action': [
+            'scripts/unpack_binaries.sh',
+            'binaries/<(archive_name).tgz',
+            '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/',
+            '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/<(archive_name).txt',
+          ],
+        },
+      ],
+      'direct_dependent_settings': {
+        'target_conditions': [
+          ['_toolset=="target"', {
+            'ldflags': [
+              # Add a relative RPATH entry to Chromium binaries. This puts
+              # instrumented DSOs before system-installed versions in library
+              # search path.
+              '-Wl,-R,\$$ORIGIN/instrumented_libraries_prebuilt/<(_sanitizer_type)/<(_libdir)/',
+              '-Wl,-z,origin',
+            ],
+          }],
+        ],
+      },
+    },
+    {
       'target_name': 'instrumented_libraries',
       'type': 'none',
       'variables': {
         'prune_self_dependency': 1,
         # Don't add this target to the dependencies of targets with type=none.
         'link_dependency': 1,
       },
       # NOTE: Please keep install-build-deps.sh in sync with this list.
       'dependencies': [
         '<(_sanitizer_type)-freetype',
@@ skipping 72 matching lines @@
           'dependencies': [
             '<(_sanitizer_type)-brltty',
             '<(_sanitizer_type)-libva1',
           ],
         }]
       ],
       'direct_dependent_settings': {
         'target_conditions': [
           ['_toolset=="target"', {
             'ldflags': [
-              # Add RPATH to result binary to make it linking instrumented libraries ($ORIGIN means relative RPATH)
+              # Add a relative RPATH entry to Chromium binaries. This puts
+              # instrumented DSOs before system-installed versions in library
+              # search path.
               '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/<(_libdir)/',
               '-Wl,-z,origin',
             ],
           }],
         ],
       },
     },
     {
       'package_name': 'freetype',
       'dependencies=': [],
@@ skipping 607 matching lines @@
       'extra_configure_flags': [
           '--disable-static',
           # See above.
           '--disable-introspection',
       ],
       'pre_build': 'scripts/pre-build/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
   ],
 }