Revert of Instrumented libraries: add a target for pre-built libraries. (patchset #2 id:20001 of https://codereview.chromium.org/1017053003/)

Reason for revert:
Broke tree.

Original issue's description:
> Instrumented libraries: add a target for pre-built libraries.
>
> With use_prebuilt_instrumented_libraries=1 in GYP_DEFINES, binaries are now
> unpacked from archive and placed into output dir.
>
> BUG=462636
> R=glider@chromium.org
> TBR=thakis@chromium.org
> NOTRY=true
>
> Committed: https://crrev.com/744256e2f3933feaa05c967541afac36825056fa
> Cr-Commit-Position: refs/heads/master@{#321804}

TBR=glider@chromium.org,thakis@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=462636

Review URL: https://codereview.chromium.org/1029103003

Cr-Commit-Position: refs/heads/master@{#321806}

3 files changed, 1 insertions, 74 deletions

diff --git a/build/common.gypi b/build/common.gypi
index f9b9bdf..663eb0d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4419,11 +4419,6 @@
               '<(DEPTH)/third_party/instrumented_libraries/instrumented_libraries.gyp:instrumented_libraries',
             ],
           }],
-          ['use_prebuilt_instrumented_libraries==1', {
-            'dependencies': [
-              '<(DEPTH)/third_party/instrumented_libraries/instrumented_libraries.gyp:prebuilt_instrumented_libraries',
-            ],
-          }],
           ['use_custom_libcxx==1', {
             'dependencies': [
               '<(DEPTH)/buildtools/third_party/libc++/libc++.gyp:libcxx_proxy',
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 2d61a3b..28fa65f 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',
             ],
diff --git a/third_party/instrumented_libraries/scripts/unpack_binaries.sh b/third_party/instrumented_libraries/scripts/unpack_binaries.sh
deleted file mode 100755
index 12af6ad..0000000
--- a/third_party/instrumented_libraries/scripts/unpack_binaries.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Copyright 2015 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.
-
-# Unpacks an archive containing prebuilt instrumented libraries into output dir.
-
-archive_file=$1
-target_dir=$2
-stamp_file=$3
-
-rm ${target_dir}/* -rf
-tar -zxf ${archive_file} -C ${target_dir}
-
-touch ${stamp_file}