Instrumented libraries: overhaul RPATH handling.

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 139 matching lines @@
           'dependencies': [
             '<(_sanitizer_type)-libcups2',
           ],
         }],
         ['tsan==1', {
           'dependencies!': [
             '<(_sanitizer_type)-libpng12-0',
           ],
         }],
       ],
-      'actions': [
-        {
-          'action_name': 'fix_rpaths',
-          'inputs': [
-            'fix_rpaths.sh',
-          ],
-          'outputs': [
-            '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/rpaths.fixed.txt',
-          ],
-          'action': [
-            './fix_rpaths.sh',
-            '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)'
-          ],
-        },
-      ],
       'direct_dependent_settings': {
         'target_conditions': [
           ['_toolset=="target"', {
             'ldflags': [
               # Add RPATH to result binary to make it linking instrumented libraries ($ORIGIN means relative RPATH)
-              '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/lib/:\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/usr/lib/x86_64-linux-gnu/',
+              '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/lib/',
               '-Wl,-z,origin',
             ],
           }],
         ],
       },
     },
     {
       'package_name': 'freetype',
       'dependencies=': [],
       'run_before_build': 'scripts/freetype.sh',
@@ skipping 487 matching lines @@
           '--with-graphite2=yes',
           '--with-gobject',
           # See above.
           '--disable-introspection',
       ],
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
   ],
 }