Move instrumented-libraries-related settings out of common.gypi.

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.
 
 {
   # Default value for all libraries.
   'custom_configure_flags': '',
   'custom_c_compiler_flags': '',
   'custom_cxx_compiler_flags': '',
   'custom_linker_flags': '',
@@ skipping 98 matching lines @@
           ],
           'outputs': [
             '<(PRODUCT_DIR)/instrumented_libraries/<(_sanitizer_type)/rpaths.fixed.txt',
           ],
           'action': [
             '<(DEPTH)/third_party/instrumented_libraries/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,-z,origin',
+            ],
+          }],
+        ],
+      },
     },
     {
       'library_name': 'freetype',
       'dependencies=': [],
       'custom_configure_flags': '',
       'run_before_build': 'freetype.sh',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libcairo2',
@@ skipping 279 matching lines @@
           # Build static libs (from debian/rules).
           '--enable-static',
           '--enable-tests=no',
       ],
       'custom_linker_flags': '-Wl,--as-needed',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
   ],
 }