Revert of Instrumented libraries: add a target for pre-built libraries.

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 2d61a3b22726c2a4f23df9d27af139724529ad70..28fa65f6c8b582ac119a85d74dd2d3c0df8974e7 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -82,57 +82,6 @@
 
   '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': {
@@ -225,9 +174,7 @@
         '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.
+              # Add RPATH to result binary to make it linking instrumented libraries ($ORIGIN means relative RPATH)
               '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/<(_libdir)/',
               '-Wl,-z,origin',
             ],